diff options
| author | Gerald Carter <jerry@samba.org> | 2005-10-06 17:48:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:04:53 -0500 |
| commit | 0bf72b6e330a76bee502cb36c1cb80c46d47d33c (patch) | |
| tree | 565aaccd5faf27918b3fad5b3ac553cd14cec835 /source3/include | |
| parent | 6de37ee5f5d015904e650df3112cf725ab0f1cb8 (diff) | |
| download | samba-0bf72b6e330a76bee502cb36c1cb80c46d47d33c.tar.gz samba-0bf72b6e330a76bee502cb36c1cb80c46d47d33c.tar.bz2 samba-0bf72b6e330a76bee502cb36c1cb80c46d47d33c.zip | |
r10781: merging eventlog and svcctl code from trunk
(This used to be commit f10aa9fb84bfac4f1a22b74d63999668700ffaac)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/rpc_eventlog.h | 8 | ||||
| -rw-r--r-- | source3/include/rpc_misc.h | 2 | ||||
| -rw-r--r-- | source3/include/rpc_svcctl.h | 17 |
3 files changed, 9 insertions, 18 deletions
diff --git a/source3/include/rpc_eventlog.h b/source3/include/rpc_eventlog.h index 7ce1199b21..9f968fb54e 100644 --- a/source3/include/rpc_eventlog.h +++ b/source3/include/rpc_eventlog.h @@ -46,6 +46,14 @@ #define EVENTLOG_AUDIT_SUCCESS 0x0008 #define EVENTLOG_AUDIT_FAILURE 0x0010 +/* Defines for TDB keys */ +#define VN_oldest_entry "INFO/oldest_entry" +#define VN_next_record "INFO/next_record" +#define VN_version "INFO/version" +#define VN_maxsize "INFO/maxsize" +#define VN_retention "INFO/retention" + +#define EVENTLOG_DATABASE_VERSION_V1 1 /***********************************/ diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h index e5d91c1b63..091ba3395e 100644 --- a/source3/include/rpc_misc.h +++ b/source3/include/rpc_misc.h @@ -27,7 +27,7 @@ #define SMB_RPC_INTERFACE_VERSION 1 #define PRS_POINTER_CAST BOOL (*)(const char*, prs_struct*, int, void*) -enum unistr2_term_codes { UNI_FLAGS_NONE = 0, UNI_STR_TERMINATE = 1, UNI_MAXLEN_TERMINATE = 2, UNI_BROKEN_NON_NULL = 3 }; +enum unistr2_term_codes { UNI_FLAGS_NONE = 0, UNI_STR_TERMINATE = 1, UNI_MAXLEN_TERMINATE = 2, UNI_BROKEN_NON_NULL = 3, UNI_STR_DBLTERMINATE = 4 }; diff --git a/source3/include/rpc_svcctl.h b/source3/include/rpc_svcctl.h index 443a6588a6..f5ad2afa1c 100644 --- a/source3/include/rpc_svcctl.h +++ b/source3/include/rpc_svcctl.h @@ -175,23 +175,6 @@ typedef struct { SC_ACTION *actions; } SERVICE_FAILURE_ACTIONS; -typedef struct Service_info_struct { - uint32 type; /* should be SVC_HANDLE_IS_SERVICE */ - pstring servicename; /* the name of the service */ - pstring servicetype; /* internal or external */ - pstring filename; /* what file name we can find this in, - as well as the "index" for what the - service name is */ - pstring provides; - pstring dependencies; - pstring shouldstart; - pstring shouldstop; - pstring requiredstart; - pstring requiredstop; - pstring shortdescription; - pstring description; -} Service_info; - /* * dispatch table of functions to handle the =ServiceControl API */ |