* srv_net.c: Conditionalize debugging variables inside DEBUG

        conditional.

        * kpasswd.c (main): Conditionalize local variables inside
        definition of LANGUAGES_SUPPORTED to avoid a variable being set
        with out use warning.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14546 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index 2e567f46657185830777ff5fa0f1cb3d11075a59..36d55878666b59e0e7c45b5fc4814a67c46afb74 100644 (file)
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-19  Ezra Peisach  <epeisach@bu.edu>
+
+       * srv_net.c: Conditionalize debugging variables inside DEBUG
+       conditional.
+
+       * kpasswd.c (main): Conditionalize local variables inside
+       definition of LANGUAGES_SUPPORTED to avoid a variable being set
+       with out use warning.
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
        * adm_conn.c, adm_rw.c, kadm5_defs.h: Make prototypes

diff --git a/src/kadmin/v5passwdd/kpasswd.c b/src/kadmin/v5passwdd/kpasswd.c
index 42d81094c33a543e8c6bc0926037d7b41aedd2a6..5f76cea60337890a76c669fc6ed91817f2c1bffb 100644 (file)
--- a/src/kadmin/v5passwdd/kpasswd.c
+++ b/src/kadmin/v5passwdd/kpasswd.c
@@ -182,8 +182,10 @@ main(argc, argv)
     int                        error;
 
     char               *name;
+#ifdef LANGUAGES_SUPPORTED
     int                        mflag;
     int                        lflag;
+#endif
     char               *language;
 
     krb5_error_code    kret;
@@ -203,7 +205,10 @@ main(argc, argv)
      * Initialize.
      */
     language = name = opwd_prompt = (char *) NULL;
-    mflag = lflag = error = 0;
+    error = 0;
+#ifdef LANGUAGES_SUPPORTED
+    mflag = lflag = 0;
+#endif
     send_quit = 0;
     ccache = (krb5_ccache) NULL;
 

diff --git a/src/kadmin/v5passwdd/srv_net.c b/src/kadmin/v5passwdd/srv_net.c
index 693eda02b241c8a9a1dcd56538aa2a920491c454..cae81fcf397d08f628e74889b20ec525e2463ec7 100644 (file)
--- a/src/kadmin/v5passwdd/srv_net.c
+++ b/src/kadmin/v5passwdd/srv_net.c
@@ -102,12 +102,16 @@ typedef struct _net_slave_info {
 #define net_not_ready_fmt      "\004select error - no socket to read"
 #define net_dispatch_msg       "network dispatch"
 
+#ifdef DEBUG
 static int net_debug_level = 0;
+#endif
 
 static char            *net_service_name = (char *) NULL;
 static int             net_service_princ_init = 0;
 static krb5_principal  net_service_principal = (krb5_principal) NULL;
+#if 0
 static int             net_server_addr_init = 0;
+#endif
 static struct sockaddr_in      net_server_addr;
 static int             net_listen_socket = -1;
 static int             net_max_slaves = 0;
@@ -452,7 +456,9 @@ net_init(kcontext, realm, debug_level, port)
     struct hostent     *our_hostent;
     struct servent     *our_servent;
 
+#ifdef DEBUG
     net_debug_level = debug_level;
+#endif
     DPRINT(DEBUG_CALLS, net_debug_level, ("* net_init(port=%d)\n", port));
 
     /* Allocate the slave table */
@@ -625,7 +631,9 @@ net_init(kcontext, realm, debug_level, port)
                    ntohs(our_servent->s_port)));
        }
     }
+#if 0
     net_server_addr_init = 1;
+#endif
 
     /* Now open the listen socket */
     net_listen_socket = socket(AF_INET, SOCK_STREAM, 0);