[Pkg-shadow-commits] r2355 - in upstream/trunk: lib libmisc

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-06 16:42:41 +0000 (Sat, 06 Sep 2008)
New Revision: 2355

Modified:
   upstream/trunk/lib/prototypes.h
   upstream/trunk/libmisc/tz.c
Log:
	* libmisc/tz.c: tz() is only used when USE_PAM is not defined.
	* lib/prototypes.h: Indicate functions whose presence depends on
	the USE_PAM flag.


Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h	2008-09-06 16:27:21 UTC (rev 2354)
+++ upstream/trunk/lib/prototypes.h	2008-09-06 16:42:41 UTC (rev 2355)
@@ -147,7 +147,9 @@
 #endif
 
 /* limits.c */
+#ifndef USE_PAM
 extern void setup_limits (const struct passwd *);
+#endif
 
 /* list.c */
 extern char **add_list (char **, const char *);
@@ -178,10 +180,14 @@
 extern struct passwd *get_my_pwent (void);
 
 /* obscure.c */
+#ifndef USE_PAM
 extern int obscure (const char *, const char *, const struct passwd *);
+#endif
 
 /* pam_pass.c */
+#ifdef USE_PAM
 extern void do_pam_passwd (const char *user, bool silent, bool change_expired);
+#endif
 
 /* port.c */
 extern bool isttytime (const char *, const char *, time_t);
@@ -190,7 +196,9 @@
 extern struct spwd *pwd_to_spwd (const struct passwd *);
 
 /* pwdcheck.c */
+#ifndef USE_PAM
 extern void passwd_check (const char *, const char *, const char *);
+#endif
 
 /* pwd_init.c */
 extern void pwd_init (void);
@@ -262,7 +270,9 @@
 extern void ttytype (const char *);
 
 /* tz.c */
+#ifndef USE_PAM
 extern char *tz (const char *);
+#endif
 
 /* ulimit.c */
 extern int set_filesize_limit (int blocks);

Modified: upstream/trunk/libmisc/tz.c
===================================================================
--- upstream/trunk/libmisc/tz.c	2008-09-06 16:27:21 UTC (rev 2354)
+++ upstream/trunk/libmisc/tz.c	2008-09-06 16:42:41 UTC (rev 2355)
@@ -33,6 +33,8 @@
 
 #include <config.h>
 
+#ifndef USE_PAM
+
 #ident "$Id$"
 
 #include <stdio.h>
@@ -40,6 +42,7 @@
 #include "defines.h"
 #include "prototypes.h"
 #include "getdef.h"
+
 /*
  * tz - return local timezone name
  *
@@ -54,10 +57,8 @@
 
 	if ((fp = fopen (fname, "r")) == NULL ||
 	    fgets (tzbuf, (int) sizeof (tzbuf), fp) == NULL) {
-#ifndef USE_PAM
 		if (!(def_tz = getdef_str ("ENV_TZ")) || def_tz[0] == '/')
 			def_tz = "TZ=CST6CDT";
-#endif				/* !USE_PAM */
 
 		strcpy (tzbuf, def_tz);
 	} else
@@ -68,3 +69,7 @@
 
 	return tzbuf;
 }
+#else				/* !USE_PAM */
+extern int errno;		/* warning: ANSI C forbids an empty source file */
+#endif				/* !USE_PAM */
+