Merge branch 'move-connection-password' of git://arthur.barton.de/ngircd-alex

[ngircd-alex.git] / src / ngircd / conn.c

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 28a0341e0a28e1485c077393671b51702b1e6141..e57aa2423a3eea2bbdacea0500fe9e3452ddb0bf 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -918,6 +918,30 @@ va_dcl
        return ok;
 } /* Conn_WriteStr */
 
        return ok;
 } /* Conn_WriteStr */
 

+GLOBAL char*
+Conn_Password( CONN_ID Idx )
+{
+       assert( Idx > NONE );
+       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 );
+
+       if (My_Connections[Idx].pwd)
+               free(My_Connections[Idx].pwd);
+
+       My_Connections[Idx].pwd = strdup(Pwd);
+       if (My_Connections[Idx].pwd == NULL) {
+               Log(LOG_EMERG, "Can't allocate memory! [Conn_SetPassword]");
+               exit(1);
+       }
+} /* Conn_SetPassword */

 
 /**
  * Append Data to the outbound write buffer of a connection.
 
 /**
  * Append Data to the outbound write buffer of a connection.


@@ -1146,6 +1170,8 @@ Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClie
 
        array_free(&My_Connections[Idx].rbuf);
        array_free(&My_Connections[Idx].wbuf);
 
        array_free(&My_Connections[Idx].rbuf);
        array_free(&My_Connections[Idx].wbuf);

+       if (My_Connections[Idx].pwd != NULL)
+               free(My_Connections[Idx].pwd);

 
        /* Clean up connection structure (=free it) */
        Init_Conn_Struct( Idx );
 
        /* Clean up connection structure (=free it) */
        Init_Conn_Struct( Idx );