[Pkg-shadow-commits] r3656 - in upstream/trunk: . lib

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2012-01-08 16:04:27 +0000 (Sun, 08 Jan 2012)
New Revision: 3656

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/prototypes.h
Log:
	* lib/prototypes.h: Cleanup.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-12-09 22:13:02 UTC (rev 3655)
+++ upstream/trunk/ChangeLog	2012-01-08 16:04:27 UTC (rev 3656)
@@ -1,3 +1,7 @@
+2012-01-08  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* lib/prototypes.h: Cleanup.
+
 2011-12-09  Peter Vrabec  <pvrabec at redhat.com>
 
 	* lib/prototypes.h, lib/Makefile.am, po/POTFILES.in,

Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h	2011-12-09 22:13:02 UTC (rev 3655)
+++ upstream/trunk/lib/prototypes.h	2012-01-08 16:04:27 UTC (rev 3656)
@@ -122,10 +122,6 @@
                       bool reset_selinux,
                       uid_t old_uid, uid_t new_uid,
                       gid_t old_gid, gid_t new_gid);
-#ifdef WITH_SELINUX
-extern int set_selinux_file_context (const char *dst_name);
-extern int reset_selinux_file_context (void);
-#endif
 
 /* encrypt.c */
 extern /*@exposed@*/char *pw_encrypt (const char *, const char *);
@@ -298,12 +294,16 @@
 extern /*@observer@*/const char *crypt_make_salt (/*@null@*//*@observer@*/const char *meth, /*@null@*/void *arg);
 
 /* selinux.c */
+#ifdef WITH_SELINUX
 extern int set_selinux_file_context (const char *dst_name);
 extern int reset_selinux_file_context (void);
+#endif
 
 /* semanage.c */
+#ifdef WITH_SELINUX
 extern int set_seuser(const char *login_name, const char *seuser_name);
 extern int del_seuser(const char *login_name);
+#endif
 
 /* setugid.c */
 extern int setup_groups (const struct passwd *info);