repo: ngircd
action: commit
revision: 
path_from: 
revision_from: c1d7f6216fc26772160f50269d87a74171f8c0a2:
path_to: 
revision_to: 

commit c1d7f6216fc26772160f50269d87a74171f8c0a2
Author: Brett Smith 
Date:   Thu Aug 23 12:24:34 2012 -0400

    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

--- 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 */

 /**

-----END OF PAGE-----