svn commit: samba r15920 - in branches/SAMBA_4_0/source/libnet: .
mimir at samba.org
mimir at samba.org
Sun May 28 10:45:23 GMT 2006
Author: mimir
Date: 2006-05-28 10:45:22 +0000 (Sun, 28 May 2006)
New Revision: 15920
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15920
Log:
Move userman.c and userinfo.c definition into respective
header files instead of composite.h
rafal
Modified:
branches/SAMBA_4_0/source/libnet/composite.h
branches/SAMBA_4_0/source/libnet/libnet.h
branches/SAMBA_4_0/source/libnet/libnet_user.h
branches/SAMBA_4_0/source/libnet/userinfo.h
branches/SAMBA_4_0/source/libnet/userman.h
Changeset:
Modified: branches/SAMBA_4_0/source/libnet/composite.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/composite.h 2006-05-28 10:43:48 UTC (rev 15919)
+++ branches/SAMBA_4_0/source/libnet/composite.h 2006-05-28 10:45:22 UTC (rev 15920)
@@ -19,12 +19,6 @@
*/
/*
- composite function io definitions
-*/
-
-#include "librpc/gen_ndr/samr.h"
-
-/*
* Monitor structure and message types definitions. Composite function monitoring
* allows client application to be notified on function progress. This enables
* eg. gui client to display progress bars, status messages, etc.
@@ -44,70 +38,3 @@
void *data;
size_t data_size;
};
-
-struct libnet_rpc_userinfo {
- struct {
- struct policy_handle domain_handle;
- const char *sid;
- uint16_t level;
- } in;
- struct {
- union samr_UserInfo info;
- } out;
-};
-
-
-struct libnet_rpc_useradd {
- struct {
- struct policy_handle domain_handle;
- const char *username;
- } in;
- struct {
- struct policy_handle user_handle;
- } out;
-};
-
-
-struct libnet_rpc_userdel {
- struct {
- struct policy_handle domain_handle;
- const char *username;
- } in;
- struct {
- struct policy_handle user_handle;
- } out;
-};
-
-
-#define USERMOD_FIELD_ACCOUNT_NAME ( 0x00000001 )
-#define USERMOD_FIELD_FULL_NAME ( 0x00000002 )
-#define USERMOD_FIELD_DESCRIPTION ( 0x00000010 )
-#define USERMOD_FIELD_COMMENT ( 0x00000020 )
-#define USERMOD_FIELD_LOGON_SCRIPT ( 0x00000100 )
-#define USERMOD_FIELD_PROFILE_PATH ( 0x00000200 )
-#define USERMOD_FIELD_ACCT_EXPIRY ( 0x00004000 )
-#define USERMOD_FIELD_ALLOW_PASS_CHG ( 0x00008000 )
-#define USERMOD_FIELD_FORCE_PASS_CHG ( 0x00010000 )
-#define USERMOD_FIELD_ACCT_FLAGS ( 0x00100000 )
-
-struct libnet_rpc_usermod {
- struct {
- struct policy_handle domain_handle;
- const char *username;
-
- struct usermod_change {
- uint32_t fields; /* bitmask field */
-
- const char *account_name;
- const char *full_name;
- const char *description;
- const char *comment;
- const char *logon_script;
- const char *profile_path;
- struct timeval *acct_expiry;
- struct timeval *allow_password_change;
- struct timeval *force_password_change;
- uint32_t acct_flags;
- } change;
- } in;
-};
Modified: branches/SAMBA_4_0/source/libnet/libnet.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet.h 2006-05-28 10:43:48 UTC (rev 15919)
+++ branches/SAMBA_4_0/source/libnet/libnet.h 2006-05-28 10:45:22 UTC (rev 15920)
@@ -47,6 +47,9 @@
#include "lib/ldb/include/ldb.h"
+#include "libnet/composite.h"
+#include "libnet/userman.h"
+#include "libnet/userinfo.h"
#include "libnet/libnet_passwd.h"
#include "libnet/libnet_time.h"
#include "libnet/libnet_rpc.h"
@@ -57,5 +60,4 @@
#include "libnet/libnet_share.h"
#include "libnet/libnet_lookup.h"
#include "libnet/libnet_domain.h"
-#include "libnet/composite.h"
#include "libnet/libnet_proto.h"
Modified: branches/SAMBA_4_0/source/libnet/libnet_user.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_user.h 2006-05-28 10:43:48 UTC (rev 15919)
+++ branches/SAMBA_4_0/source/libnet/libnet_user.h 2006-05-28 10:45:22 UTC (rev 15920)
@@ -54,3 +54,24 @@
const char *error_string;
} out;
};
+
+
+struct libnet_ModifyUser {
+ struct {
+ const char *user_name;
+ const char *domain_name;
+
+ const char *full_name;
+ const char *description;
+ const char *comment;
+ const char *logon_script;
+ const char *profile_path;
+ struct timeval *acct_expiry;
+ struct timeval *allow_password_change;
+ struct timeval *force_password_change;
+ uint32_t acct_flags;
+ } in;
+ struct {
+ const char *error_string;
+ } out;
+};
Modified: branches/SAMBA_4_0/source/libnet/userinfo.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/userinfo.h 2006-05-28 10:43:48 UTC (rev 15919)
+++ branches/SAMBA_4_0/source/libnet/userinfo.h 2006-05-28 10:45:22 UTC (rev 15920)
@@ -19,7 +19,25 @@
*/
+#include "librpc/gen_ndr/samr.h"
+
/*
+ * IO structures for userinfo.c functions
+ */
+
+struct libnet_rpc_userinfo {
+ struct {
+ struct policy_handle domain_handle;
+ const char *sid;
+ uint16_t level;
+ } in;
+ struct {
+ union samr_UserInfo info;
+ } out;
+};
+
+
+/*
* Monitor messages sent from userinfo.c functions
*/
Modified: branches/SAMBA_4_0/source/libnet/userman.h
===================================================================
--- branches/SAMBA_4_0/source/libnet/userman.h 2006-05-28 10:43:48 UTC (rev 15919)
+++ branches/SAMBA_4_0/source/libnet/userman.h 2006-05-28 10:45:22 UTC (rev 15920)
@@ -20,6 +20,66 @@
/*
+ * IO structures for userman.c functions
+ */
+
+struct libnet_rpc_useradd {
+ struct {
+ struct policy_handle domain_handle;
+ const char *username;
+ } in;
+ struct {
+ struct policy_handle user_handle;
+ } out;
+};
+
+
+struct libnet_rpc_userdel {
+ struct {
+ struct policy_handle domain_handle;
+ const char *username;
+ } in;
+ struct {
+ struct policy_handle user_handle;
+ } out;
+};
+
+
+#define USERMOD_FIELD_ACCOUNT_NAME ( 0x00000001 )
+#define USERMOD_FIELD_FULL_NAME ( 0x00000002 )
+#define USERMOD_FIELD_DESCRIPTION ( 0x00000010 )
+#define USERMOD_FIELD_COMMENT ( 0x00000020 )
+#define USERMOD_FIELD_LOGON_SCRIPT ( 0x00000100 )
+#define USERMOD_FIELD_PROFILE_PATH ( 0x00000200 )
+#define USERMOD_FIELD_ACCT_EXPIRY ( 0x00004000 )
+#define USERMOD_FIELD_ALLOW_PASS_CHG ( 0x00008000 )
+#define USERMOD_FIELD_FORCE_PASS_CHG ( 0x00010000 )
+#define USERMOD_FIELD_ACCT_FLAGS ( 0x00100000 )
+
+struct libnet_rpc_usermod {
+ struct {
+ struct policy_handle domain_handle;
+ const char *username;
+
+ struct usermod_change {
+ uint32_t fields; /* bitmask field */
+
+ const char *account_name;
+ const char *full_name;
+ const char *description;
+ const char *comment;
+ const char *logon_script;
+ const char *profile_path;
+ struct timeval *acct_expiry;
+ struct timeval *allow_password_change;
+ struct timeval *force_password_change;
+ uint32_t acct_flags;
+ } change;
+ } in;
+};
+
+
+/*
* Monitor messages sent from userman.c functions
*/
More information about the samba-cvs
mailing list