X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Frcpt500%2Fmain.c;h=f970476a5e8012fce75bfe84b2e1eb6320bcc28d;hb=ebfe58344c63a5fd99caf37f72a6acf02e6afc0e;hp=74fe9d088d56c7cb70549ba37ba3c58c58a7ce1b;hpb=df8f7cbb9b79be3be9205d116d1dd0b263d6861a;p=openldap

diff --git a/clients/rcpt500/main.c b/clients/rcpt500/main.c
index 74fe9d088d..f970476a5e 100644
--- a/clients/rcpt500/main.c
+++ b/clients/rcpt500/main.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /*
  * main.c: for rcpt500 (X.500 email query responder)
  *
@@ -125,7 +126,7 @@ main( int argc, char **argv )
 	 */
 #ifdef LOG_DAEMON
 	openlog( prog, OPENLOG_OPTIONS, LOG_DAEMON );
-#else
+#elif LOG_DEBUG
 	openlog( prog, OPENLOG_OPTIONS );
 #endif
     }
@@ -140,7 +141,7 @@ main( int argc, char **argv )
     if ( dosyslog ) {
 	syslog( LOG_INFO, "processing command \"%s %s\" from %s",
 		( msg.msg_command < 0 ) ? "Unknown" :
-		cmds[ msg.msg_command ].cmd_text,
+		rcpt_cmds[ msg.msg_command ].cmd_text,
 		( msg.msg_arg == NULL ) ? "" : msg.msg_arg, msg.msg_replyto );
     }
 
@@ -150,10 +151,10 @@ main( int argc, char **argv )
 
 /*
     sprintf( reply, "Your request was interpreted as: %s %s\n\n",
-	    cmds[ msg.msg_command ].cmd_text, msg.msg_arg );
+	    rcpt_cmds[ msg.msg_command ].cmd_text, msg.msg_arg );
 */
 
-    (*cmds[ msg.msg_command ].cmd_handler)( &msg, reply );
+    (*rcpt_cmds[ msg.msg_command ].cmd_handler)( &msg, reply );
 
     if ( send_reply( &msg, reply ) < 0 ) {
 	if ( dosyslog ) {
@@ -359,10 +360,10 @@ find_command( char *text, char **argp )
     }
     *s = '\0';
 
-    for ( i = 0; cmds[ i ].cmd_text != NULL; ++i ) {
-	if (( s = strstr( argbuf, cmds[ i ].cmd_text )) != NULL
-	    && isspace( (unsigned char) s[ strlen( cmds[ i ].cmd_text ) ] )) {
-	    strcpy( argbuf, text + (s - argbuf) + strlen( cmds[ i ].cmd_text ));
+    for ( i = 0; rcpt_cmds[ i ].cmd_text != NULL; ++i ) {
+	if (( s = strstr( argbuf, rcpt_cmds[ i ].cmd_text )) != NULL
+	    && isspace( (unsigned char) s[ strlen( rcpt_cmds[ i ].cmd_text ) ] )) {
+	    strcpy( argbuf, text + (s - argbuf) + strlen( rcpt_cmds[ i ].cmd_text ));
 	    *argp = argbuf;
 	    while ( isspace( (unsigned char) **argp )) {
 		++(*argp);