diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-26 16:57:08 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:58 -0500 |
| commit | 49839f356f493d0de1b719c8c3bfdee4713c0728 (patch) | |
| tree | 62055f766b1dea0f06a623e8454d22994dd500f2 /source4/include | |
| parent | f801ad359290c51d3216c755fb2a8344babb484f (diff) | |
| download | samba-49839f356f493d0de1b719c8c3bfdee4713c0728.tar.gz samba-49839f356f493d0de1b719c8c3bfdee4713c0728.tar.bz2 samba-49839f356f493d0de1b719c8c3bfdee4713c0728.zip | |
r10513: Reduce some use of pstring. The main reason some parts of the code still
use pstring is next_token() now.
(This used to be commit a5b88bcd420eb7ae42283293541519e142be36e3)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/enums.h | 27 | ||||
| -rw-r--r-- | source4/include/includes.h | 5 |
2 files changed, 1 insertions, 31 deletions
diff --git a/source4/include/enums.h b/source4/include/enums.h index e56f403a30..4e8e7b04a0 100644 --- a/source4/include/enums.h +++ b/source4/include/enums.h @@ -27,29 +27,4 @@ enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANMAN1,PROTOCOL_LANMAN2,PROTOCOL_NT1}; /* security levels */ -enum security_types {SEC_SHARE,SEC_USER,SEC_SERVER,SEC_DOMAIN,SEC_ADS}; - -/* printing types */ -enum printing_types {PRINT_BSD,PRINT_SYSV,PRINT_AIX,PRINT_HPUX, - PRINT_QNX,PRINT_PLP,PRINT_LPRNG,PRINT_SOFTQ, - PRINT_CUPS,PRINT_LPRNT,PRINT_LPROS2 -#ifdef DEVELOPER -,PRINT_TEST,PRINT_VLP -#endif /* DEVELOPER */ -}; - -/* LDAP schema types */ -enum schema_types {SCHEMA_COMPAT, SCHEMA_AD, SCHEMA_SAMBA}; - -/* LDAP SSL options */ -enum ldap_ssl_types {LDAP_SSL_ON, LDAP_SSL_OFF, LDAP_SSL_START_TLS}; - -/* LDAP PASSWD SYNC methods */ -enum ldap_passwd_sync_types {LDAP_PASSWD_SYNC_ON, LDAP_PASSWD_SYNC_OFF, LDAP_PASSWD_SYNC_ONLY}; - -/* Remote architectures we know about. */ -enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_SAMBA}; - -/* case handling */ -enum case_handling {CASE_LOWER,CASE_UPPER}; - +enum security_types {SEC_SHARE,SEC_USER}; diff --git a/source4/include/includes.h b/source4/include/includes.h index 882c8e6277..41452578ee 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -64,11 +64,6 @@ #include <varargs.h> #endif -/* we support ADS if we want it and have krb5 and ldap libs */ -#if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP) -#define HAVE_ADS -#endif - /* tell ldb we have the internal ldap code */ #define HAVE_ILDAP 1 |