diff options
| author | Luke Leighton <lkcl@samba.org> | 2000-03-30 01:21:18 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 2000-03-30 01:21:18 +0000 |
| commit | c7bf1b1c3253b86d0c9ebea04e4566e562e23299 (patch) | |
| tree | a9ff3d0e777c7187821cff4e8caafe4984c718b1 | |
| parent | a1f565d91156daa8346bad16c8c5130bae885356 (diff) | |
| download | samba-c7bf1b1c3253b86d0c9ebea04e4566e562e23299.tar.gz | |
oops! getopt was causing grief for make proto.
| -rw-r--r-- | source/include/includes.h | 4 | ||||
| -rw-r--r-- | source/include/proto.h | 3 | ||||
| -rw-r--r-- | source/lib/getopt.c | 13 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index 27e991c5a63..c4194d70cd5 100644 --- a/source/include/includes.h +++ b/source/include/includes.h @@ -695,10 +695,6 @@ union semun { #define OSF1_ENH_SEC 1 #endif -#if defined(HAVE_PAM_AUTHENTICATE) && defined(HAVE_SECURITY_PAM_APPL_H) -#define HAVE_PAM 1 -#endif - #ifndef ALLOW_CHANGE_PASSWORD #if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID)) #define ALLOW_CHANGE_PASSWORD 1 diff --git a/source/include/proto.h b/source/include/proto.h index 74d90c54bf1..1cd010c405f 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -260,6 +260,9 @@ int fnmatch (const char *pattern, const char *string, int flags); void generate_random_buffer( unsigned char *out, int len, BOOL re_seed); +/*The following definitions come from lib/getopt.c */ + + /*The following definitions come from lib/getsmbpass.c */ char *getsmbpass(char *prompt) ; diff --git a/source/lib/getopt.c b/source/lib/getopt.c index 58da29a6900..cc9798429da 100644 --- a/source/lib/getopt.c +++ b/source/lib/getopt.c @@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - + /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. Ditto for AIX 3.2 and <stdlib.h>. */ #ifndef _NO_PROTO @@ -140,7 +140,7 @@ static enum /* Value of POSIXLY_CORRECT environment variable. */ static char *posixly_correct; - + #ifdef __GNU_LIBRARY__ /* We want to avoid inclusion of string.h with non-GNU libraries because there are many ways it can cause trouble. @@ -182,7 +182,7 @@ extern int strlen (const char *); #endif /* __GNUC__ */ #endif /* not __GNU_LIBRARY__ */ - + /* Handle permutation of arguments. */ /* Describe the part of ARGV that contains non-options that have @@ -292,7 +292,7 @@ _getopt_initialize (optstring) return optstring; } - + /* Scan elements of ARGV (whose length is ARGC) for option characters given in OPTSTRING. @@ -674,7 +674,7 @@ getopt_long (argc, argv, options, long_options, opt_index) } #endif /* _LIBC or not __GNU_LIBRARY__. */ - + #ifdef TEST /* Compile with -DTEST to make an executable for use in testing @@ -747,5 +747,6 @@ main (argc, argv) #endif /* TEST */ #else /* HAVE_GETOPT_LONG */ -void getopt_dummy(void) {} + void getopt_dummy(void) {} #endif + |