ifdef code not used if no DEBUG1

diff --git a/etc/afpd/afp_util.c b/etc/afpd/afp_util.c
index a80c83c799c6434fdbe5718f84c4715bd604217e..93d91f3ae09cb9753f7d5504bf74889e33c0a67b 100644 (file)
--- a/etc/afpd/afp_util.c
+++ b/etc/afpd/afp_util.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_util.c,v 1.3 2003-03-12 15:07:01 didg Exp $
+ * $Id: afp_util.c,v 1.3.6.1 2003-09-30 14:52:45 didg Exp $
  *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -14,6 +14,7 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef DEBUG1
 #include <atalk/afp.h>
 
 const char *AfpNum2name(int num)
@@ -88,3 +89,4 @@ const char *AfpNum2name(int num)
        }                                                                                         
        return "not yet defined";                                                                 
 }
+#endif

diff --git a/etc/afpd/auth.c b/etc/afpd/auth.c
index d947e17c119da6c155bd1c1a59854284edccb0ac..112090b6ea9c471a7fcbe5347176bddd231eda1c 100644 (file)
--- a/etc/afpd/auth.c
+++ b/etc/afpd/auth.c
@@ -1,5 +1,5 @@
 /*
- * $Id: auth.c,v 1.44.2.3.2.4 2003-09-25 12:54:45 didg Exp $
+ * $Id: auth.c,v 1.44.2.3.2.5 2003-09-30 14:52:45 didg Exp $
  *
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -175,6 +175,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void))
     LOG(log_info, logtype_afpd, "login %s (uid %d, gid %d) %s", pwd->pw_name,
         pwd->pw_uid, pwd->pw_gid , afp_versions[afp_version_index].av_name);
 
+#ifndef NO_DDP
     if (obj->proto == AFPPROTO_ASP) {
         ASP asp = obj->handle;
         int addr_net = ntohs( asp->asp_sat.sat_addr.s_net );
@@ -211,6 +212,7 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void))
             } /* if (addr_net && addr_node ) */
         } /* if (options->authprintdir) */
     } /* if (obj->proto == AFPPROTO_ASP) */
+#endif
 
     if (initgroups( pwd->pw_name, pwd->pw_gid ) < 0) {
 #ifdef RUN_AS_USER
@@ -280,13 +282,10 @@ static int login(AFPObj *obj, struct passwd *pwd, void (*logout)(void))
         }
     }
 #else /* TRU64 */
-#if 0
-        if (setregid(pwd->pw_gid, pwd->pw_gid ) < 0 || setreuid(pwd->pw_uid,pwd->pw_uid ) < 0) {
-#endif        
-        if (setegid( pwd->pw_gid ) < 0 || seteuid( pwd->pw_uid ) < 0) {
-            LOG(log_error, logtype_afpd, "login: %s", strerror(errno) );
-            return AFPERR_BADUAM;
-        }
+    if (setegid( pwd->pw_gid ) < 0 || seteuid( pwd->pw_uid ) < 0) {
+        LOG(log_error, logtype_afpd, "login: %s", strerror(errno) );
+        return AFPERR_BADUAM;
+    }
 #endif /* TRU64 */
 
     /* There's probably a better way to do this, but for now, we just

diff --git a/etc/afpd/ofork.c b/etc/afpd/ofork.c
index 5e3354ce17ca380dcfb9253d51f81fb4f2ebd208..a9aee77976ad5fa2b0fceab4a0b860a44ca86413 100644 (file)
--- a/etc/afpd/ofork.c
+++ b/etc/afpd/ofork.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ofork.c,v 1.20.6.1 2003-09-09 16:42:20 didg Exp $
+ * $Id: ofork.c,v 1.20.6.2 2003-09-30 14:52:45 didg Exp $
  *
  * Copyright (c) 1996 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
@@ -66,6 +66,7 @@ static __inline__ void of_unhash(struct ofork *of)
     }
 }
 
+#ifdef DEBUG1
 void of_pforkdesc( f )
 FILE   *f;
 {
@@ -80,6 +81,7 @@ FILE  *f;
         }
     }
 }
+#endif
 
 int of_flush(const struct vol *vol)
 {