s3-samr: use samr_DomainServerState in client tools.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 4bc524f40a7148b184e8e0f41994e20350527f71..cc92867016303840a5d3952733f34698b83d2a88 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5600,7 +5600,7 @@ void init_samr_DomGeneralInformation(struct samr_DomGeneralInformation *r,
                                     const char *domain_name,
                                     const char *primary,
                                     uint64_t sequence_num,
-                                    uint32_t unknown2,
+                                    enum samr_DomainServerState domain_server_state,
                                     enum samr_Role role,
                                     uint32_t unknown3,
                                     uint32_t num_users,

diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
index 473fae73afcf3de66d509f5d8579fc557cef2785..6a9e6d16828b6eb1a2d4e10ff52f652a28e292b2 100644 (file)
--- a/source3/rpc_client/init_samr.c
+++ b/source3/rpc_client/init_samr.c
@@ -47,7 +47,7 @@ void init_samr_DomGeneralInformation(struct samr_DomGeneralInformation *r,
                                     const char *domain_name,
                                     const char *primary,
                                     uint64_t sequence_num,
-                                    uint32_t unknown2,
+                                    enum samr_DomainServerState domain_server_state,
                                     enum samr_Role role,
                                     uint32_t unknown3,
                                     uint32_t num_users,
@@ -59,7 +59,7 @@ void init_samr_DomGeneralInformation(struct samr_DomGeneralInformation *r,
        init_lsa_String(&r->domain_name, domain_name);
        init_lsa_String(&r->primary, primary);
        r->sequence_num = sequence_num;
-       r->unknown2 = unknown2;
+       r->domain_server_state = domain_server_state;
        r->role = role;
        r->unknown3 = unknown3;
        r->num_users = num_users;
@@ -134,11 +134,12 @@ void init_samr_DomInfo8(struct samr_DomInfo8 *r,
 ********************************************************************/
 
 void init_samr_DomInfo9(struct samr_DomInfo9 *r,
-                       uint32_t unknown)
+                       enum samr_DomainServerState domain_server_state)
 {
-       r->unknown = unknown;
+       r->domain_server_state = domain_server_state;
 }
 
+
 /*******************************************************************
  inits a structure.
 ********************************************************************/

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 3b8c3a15470cc00c974dafe7934b30518a4318a3..7cc4b2c19287e5cc78a35172b341140be3327329 100644 (file)
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -3109,7 +3109,7 @@ NTSTATUS _samr_QueryDomainInfo(pipes_struct *p,
                                                        lp_workgroup(),
                                                        global_myname(),
                                                        seq_num,
-                                                       1,
+                                                       DOMAIN_SERVER_ENABLED,
                                                        server_role,
                                                        1,
                                                        num_users,

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 3494e9123a0c6b005aa4f372cdb41b30f008e367..eaf5adbfa598f94b15dd2e1023e8917a14e10699 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -161,7 +161,7 @@ static void display_sam_dom_info_2(struct samr_DomGeneralInformation *general)
        printf("Force Logoff:\t%d\n",
                (int)nt_time_to_unix_abs(&general->force_logoff_time));
 
-       printf("Unknown 2:\t0x%x\n", general->unknown2);
+       printf("Domain Server State:\t0x%x\n", general->domain_server_state);
        printf("Server Role:\t%s\n", server_role_str(general->role));
        printf("Unknown 3:\t0x%x\n", general->unknown3);
 }
@@ -201,7 +201,7 @@ static void display_sam_dom_info_8(struct samr_DomInfo8 *info8)
 
 static void display_sam_dom_info_9(struct samr_DomInfo9 *info9)
 {
-       printf("unknown:\t%d (0x%08x)\n", info9->unknown, info9->unknown);
+       printf("Domain Server State:\t0x%x\n", info9->domain_server_state);
 }
 
 static void display_sam_dom_info_12(struct samr_DomInfo12 *info12)