prepare to upload

[debian/sudo] / sudo.h

diff --git a/sudo.h b/sudo.h
index fe6a7100ee7ee100b3cfc3cd0ae61da8ece32a97..20e047653ab04d67a5f5919c75aef2b1c1e72440 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1993-1996, 1998-2005, 2007-2008
+ * Copyright (c) 1993-1996, 1998-2005, 2007-2009
  *     Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -17,8 +17,6 @@
  * Sponsored in part by the Defense Advanced Research Projects
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $Sudo: sudo.h,v 1.269 2008/11/25 17:01:34 millert Exp $
  */
 
 #ifndef _SUDO_SUDO_H
@@ -47,8 +45,6 @@ struct sudo_user {
     char *ttypath;
     char *host;
     char *shost;
-    int   host_fqdn_queried;
-    char **runas;
     char *prompt;
     char *cmnd;
     char *cmnd_args;
@@ -131,6 +127,8 @@ struct sudo_user {
 #define PERM_RUNAS               0x04
 #define PERM_FULL_RUNAS          0x05
 #define PERM_TIMESTAMP           0x06
+#define PERM_NOEXIT              0x10 /* flag */
+#define PERM_MASK                0xf0
 
 /*
  * Shortcuts for sudo_user contents.
@@ -239,6 +237,12 @@ void *memrchr              __P((const void *, int, size_t));
 #ifndef HAVE_MKSTEMP
 int mkstemp            __P((char *));
 #endif
+#ifndef HAVE_SETENV
+int setenv             __P((const char *, const char *, int));
+#endif
+#ifndef HAVE_UNSETENV
+int unsetenv           __P((const char *));
+#endif
 char *sudo_goodpath    __P((const char *, struct stat *));
 char *tgetpass         __P((const char *, int, int));
 int find_path          __P((char *, char **, struct stat *, char *));
@@ -265,7 +269,7 @@ int sudo_file_display_cmnd __P((struct sudo_nss *, struct passwd *));
 int sudo_file_display_defaults __P((struct sudo_nss *, struct passwd *, struct lbuf *));
 int sudo_file_display_bound_defaults __P((struct sudo_nss *, struct passwd *, struct lbuf *));
 int sudo_file_display_privs __P((struct sudo_nss *, struct passwd *, struct lbuf *));
-void set_perms         __P((int));
+int set_perms          __P((int));
 void remove_timestamp  __P((int));
 int check_secureware   __P((char *));
 void sia_attempt_auth  __P((void));
@@ -294,13 +298,11 @@ char *sudo_getepw __P((const struct passwd *));
 int pam_prep_user      __P((struct passwd *));
 void zero_bytes                __P((volatile void *, size_t));
 int gettime            __P((struct timespec *));
-FILE *open_sudoers     __P((const char *, int *));
+FILE *open_sudoers     __P((const char *, int, int *));
 void display_privs     __P((struct sudo_nss_list *, struct passwd *));
 int display_cmnd       __P((struct sudo_nss_list *, struct passwd *));
 int get_ttycols                __P((void));
 char *sudo_parseln     __P((FILE *));
-void sudo_setenv       __P((const char *, const char *, int));
-void sudo_unsetenv     __P((const char *));
 void sudo_setgrent     __P((void));
 void sudo_endgrent     __P((void));
 void sudo_setpwent     __P((void));