From: Brett Smith <brett@w3.org>
Date: Thu, 23 Aug 2012 16:24:34 +0000 (-0400)
Subject: Implementation clean-ups.
X-Git-Tag: rel-20-rc1~104^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1d7f6216fc26772160f50269d87a74171f8c0a2;p=ngircd

Implementation clean-ups.

* Have Conn_Password return an empty string when no password has been set,
  to play better with pam.c.

* Use strdup in Conn_SetPassword.
---

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 03c423e3..20d0cd4f 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -922,19 +922,21 @@ GLOBAL const char*
 Conn_Password( CONN_ID Idx )
 {
   assert( Idx > NONE );
-  return My_Connections[Idx].pwd;
+  if (My_Connections[Idx].pwd == NULL)
+    return (char*)"\0";
+  else
+    return My_Connections[Idx].pwd;
 } /* Conn_Password */
 
 GLOBAL void
 Conn_SetPassword( CONN_ID Idx, const char *Pwd )
 {
   assert( Idx > NONE );
-  My_Connections[Idx].pwd = calloc(strlen(Pwd) + 1, sizeof(char));
+  My_Connections[Idx].pwd = strdup(Pwd);
   if (My_Connections[Idx].pwd == NULL) {
     Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
     exit(1);
   }
-  strcpy( My_Connections[Idx].pwd, Pwd );
 } /* Conn_SetPassword */
 
 /**