diff options
| author | Tim Potter <tpot@samba.org> | 2003-04-14 02:36:12 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-04-14 02:36:12 +0000 |
| commit | 5e1789d5d4d5048e3da2cda79c104cb6226de3a8 (patch) | |
| tree | 17a26299d09d6301818b51755255e18f03d41e64 | |
| parent | e0cf81f1044eab1156dc30c06e7e788b640499f9 (diff) | |
| download | samba-5e1789d5d4d5048e3da2cda79c104cb6226de3a8.tar.gz samba-5e1789d5d4d5048e3da2cda79c104cb6226de3a8.tar.bz2 samba-5e1789d5d4d5048e3da2cda79c104cb6226de3a8.zip | |
Merge new popt_common.h include file.
(This used to be commit 1fb4b8fe4310dd15c1842935871ead0745859a54)
| -rw-r--r-- | source3/include/smb.h | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 75bc44d978..bc107073ab 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -241,13 +241,14 @@ typedef struct nttime_info enum SID_NAME_USE { SID_NAME_USER = 1, /* user */ - SID_NAME_DOM_GRP = 2, /* domain group */ - SID_NAME_DOMAIN = 3, /* domain: don't know what this is */ - SID_NAME_ALIAS = 4, /* local group */ - SID_NAME_WKN_GRP = 5, /* well-known group */ - SID_NAME_DELETED = 6, /* deleted account: needed for c2 rating */ - SID_NAME_INVALID = 7, /* invalid account */ - SID_NAME_UNKNOWN = 8 /* oops. */ + SID_NAME_DOM_GRP, /* domain group */ + SID_NAME_DOMAIN, /* domain sid */ + SID_NAME_ALIAS, /* local group */ + SID_NAME_WKN_GRP, /* well-known group */ + SID_NAME_DELETED, /* deleted account: needed for c2 rating */ + SID_NAME_INVALID, /* invalid account */ + SID_NAME_UNKNOWN, /* unknown sid type */ + SID_NAME_COMPUTER, /* sid for a computer */ }; /** @@ -1714,14 +1715,7 @@ typedef struct { #define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14 -/* Common popt structures */ - -extern struct poptOption popt_common_debug[]; -extern struct poptOption popt_common_configfile[]; -extern struct poptOption popt_common_socket_options[]; -extern struct poptOption popt_common_version[]; -extern struct poptOption popt_common_netbios_name[]; -extern struct poptOption popt_common_log_base[]; +#include "popt_common.h" /* Module support */ typedef NTSTATUS (init_module_function) (void); |