From: nekral-guest Date: Sun, 8 Jan 2012 16:04:27 +0000 (+0000) Subject: * lib/prototypes.h: Cleanup. X-Git-Tag: 4.1.5~27 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ac5cc7dd03ff3605246843da60f4873de5d20b5;p=shadow * lib/prototypes.h: Cleanup. --- diff --git a/ChangeLog b/ChangeLog index dc4a739a..ce57ab8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-01-08 Nicolas François + + * lib/prototypes.h: Cleanup. + 2011-12-09 Peter Vrabec * lib/prototypes.h, lib/Makefile.am, po/POTFILES.in, diff --git a/lib/prototypes.h b/lib/prototypes.h index f001a331..eb26d4d4 100644 --- a/lib/prototypes.h +++ b/lib/prototypes.h @@ -122,10 +122,6 @@ extern int copy_tree (const char *src_root, const char *dst_root, 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 void process_root_flag (const char* short_opt, int argc, char **argv); 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);