1
0
mirror of https://github.com/samba-team/samba.git synced 2025-11-18 00:23:50 +03:00

Merge new popt_common.h include file.

This commit is contained in:
Tim Potter
-
parent 93101a93da
commit 1fb4b8fe43

View File

@@ -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);