Changeset 18454

Timestamp:

02/13/12 18:50:44 (16 months ago)

Author:

BrainSlayer

Message:

Update

Location:

src/router/samba36/source3

Files:

• lib/netapi/serverinfo.c (modified) (1 diff)
• lib/smbconf/smbconf_init.c (modified) (1 diff)
• librpc/rpc/rpc_common.c (modified) (2 diffs)
• rpc_server/rpc_ep_setup.c (modified) (12 diffs)
• rpc_server/wkssvc/srv_wkssvc_nt.c (modified) (2 diffs)
• rpcclient/rpcclient.c (modified) (3 diffs)
• smbd/lanman.c (modified) (4 diffs)
• smbd/server_exit.c (modified) (3 diffs)

src/router/samba36/source3/lib/netapi/serverinfo.c

@@ -558 +558 @@
         }
 
-        if (!lp_config_backend_is_registry()) {
+#ifdef REGISTRY_BACKEND
+        if (!lp_config_backend_is_registry())
+#endif
+        {
                 libnetapi_set_error_string(ctx,
                         "Configuration manipulation requested but not "

src/router/samba36/source3/lib/smbconf/smbconf_init.c

@@ -69 +69 @@
         }
 
+#ifdef REGISTRY_BACKEND
         if (strequal(backend, "registry") || strequal(backend, "reg")) {
                 err = smbconf_init_reg(mem_ctx, conf_ctx, path);
-        } else if (strequal(backend, "file") || strequal(backend, "txt")) {
+        } else
+#endif
+        if (strequal(backend, "file") || strequal(backend, "txt")) {
                 err = smbconf_init_txt(mem_ctx, conf_ctx, path);
         } else if (sep == NULL) {

src/router/samba36/source3/librpc/rpc/rpc_common.c

@@ -101 +101 @@
         }
 #endif
+#ifdef SAMR_SUPPORT
         if (!smb_register_ndr_interface(&ndr_table_samr)) {
                 return false;
         }
+#endif
 #ifdef NETLOGON_SUPPORT
         if (!smb_register_ndr_interface(&ndr_table_netlogon)) {
@@ -109 +111 @@
         }
 #endif
-#ifdef SRVSVC_SUPPORT
         if (!smb_register_ndr_interface(&ndr_table_srvsvc)) {
                 return false;
         }
-#endif
-#ifdef WKSSVC_SUPPORT
         if (!smb_register_ndr_interface(&ndr_table_wkssvc)) {
                 return false;
         }
-#endif
 #ifdef WINREG_SUPPORT
         if (!smb_register_ndr_interface(&ndr_table_winreg)) {

src/router/samba36/source3/rpc_server/rpc_ep_setup.c

@@ -460 +460 @@
 #endif
 
-#ifdef SRVSVC_SUPPORT
 static bool srvsvc_init_cb(void *ptr)
 {
@@ -509 +508 @@
         return true;
 }
-#endif
 
 static bool lsarpc_init_cb(void *ptr)
@@ -560 +558 @@
 }
 
+#ifdef SAMR_SUPPORT
 static bool samr_init_cb(void *ptr)
 {
@@ -608 +607 @@
         return true;
 }
+#endif
 
 #ifdef NETLOGON_SUPPORT
@@ -987 +987 @@
 #endif
 
-#ifdef WKSSVC_SUPPORT
 static bool wkssvc_init_cb(void *ptr)
 {
@@ -1035 +1034 @@
         return true;
 }
-#endif
 
 bool dcesrv_ep_setup(struct tevent_context *ev_ctx,
@@ -1101 +1099 @@
 #endif
 
-#ifdef SRVSVC_SUPPORT
         srvsvc_cb.init         = srvsvc_init_cb;
         srvsvc_cb.shutdown     = NULL;
@@ -1108 +1105 @@
                 return false;
         }
-#endif
+
 
         lsarpc_cb.init         = lsarpc_init_cb;
@@ -1117 +1114 @@
         }
 
+#ifdef SAMR_SUPPORT
         samr_cb.init         = samr_init_cb;
         samr_cb.shutdown     = NULL;
@@ -1123 +1121 @@
                 return false;
         }
+#endif
 
 #ifdef NETLOGON_SUPPORT
@@ -1213 +1212 @@
 #endif
 
-#ifdef WKSSVC_SUPPORT
         wkssvc_cb.init         = wkssvc_init_cb;
         wkssvc_cb.shutdown     = NULL;
@@ -1220 +1218 @@
                 return false;
         }
-#endif
 
         return true;

src/router/samba36/source3/rpc_server/wkssvc/srv_wkssvc_nt.c

@@ -821 +821 @@
         struct security_token *token = p->session_info->security_token;
 
+#ifndef NETLOGON_SUPPORT
+        return WERR_NOT_SUPPORTED;
+#endif
+
         if (!r->in.domain_name) {
                 return WERR_INVALID_PARAM;
@@ -898 +902 @@
         struct security_token *token = p->session_info->security_token;
 
+#ifndef NETLOGON_SUPPORT
+        return WERR_NOT_SUPPORTED;
+#endif
+
         if (!r->in.account || !r->in.encrypted_password) {
                 return WERR_INVALID_PARAM;

src/router/samba36/source3/rpcclient/rpcclient.c

@@ -624 +624 @@
         lsarpc_commands,
         ds_commands,
+#ifdef SAMR_SUPPORT
         samr_commands,
+#endif
 #ifdef PRINTER_SUPPORT
         spoolss_commands,
@@ -631 +633 @@
         netlogon_commands,
 #endif
-#ifdef SRVSVC_SUPPORT
         srvsvc_commands,
-#endif
 #ifdef DFS_SUPPORT
         dfs_commands,
@@ -643 +643 @@
         shutdown_commands,
         test_commands,
-#ifdef WKSSVC_SUPPORT
         wkssvc_commands,
-#endif
 #ifdef EXTRA_SERVICES
         ntsvcs_commands,

src/router/samba36/source3/smbd/lanman.c

@@ -2198 +2198 @@
         struct dcerpc_binding_handle *b;
 
-#ifndef SRVSVC_SUPPORT
-        return False;
-#endif
-
         if (!str1 || !str2 || !p) {
                 return False;
@@ -3823 +3819 @@
         WERROR werr;
         TALLOC_CTX *mem_ctx = talloc_tos();
+        struct rpc_pipe_client *cli = NULL;
+        union srvsvc_NetSrvInfo info;
         int errcode;
+        struct dcerpc_binding_handle *b;
 
         if (!str1 || !str2 || !p) {
@@ -3886 +3885 @@
         p2 = p + struct_len;
 
+        status = rpc_pipe_open_interface(mem_ctx, &ndr_table_srvsvc.syntax_id,
+                                        conn->session_info,
+                                        &conn->sconn->client_id,
+                                        conn->sconn->msg_ctx,
+                                        &cli);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0,("api_RNetServerGetInfo: could not connect to srvsvc: %s\n",
+                          nt_errstr(status)));
+                errcode = W_ERROR_V(ntstatus_to_werror(status));
+                goto out;
+        }
+
+        b = cli->binding_handle;
+
+        status = dcerpc_srvsvc_NetSrvGetInfo(b, mem_ctx,
+                                             NULL,
+                                             101,
+                                             &info,
+                                             &werr);
+        if (!NT_STATUS_IS_OK(status)) {
+                errcode = W_ERROR_V(ntstatus_to_werror(status));
+                goto out;
+        }
+        if (!W_ERROR_IS_OK(werr)) {
+                errcode = W_ERROR_V(werr);
+                goto out;
+        }
+
+        if (info.info101 == NULL) {
+                errcode = W_ERROR_V(WERR_INVALID_PARAM);
+                goto out;
+        }
+
         if (uLevel != 20) {
-                srvstr_push(NULL, 0, p, global_myname(), 16,
+                srvstr_push(NULL, 0, p, info.info101->server_name, 16,
                         STR_ASCII|STR_UPPER|STR_TERMINATE);
-        }
+        }
         p += 16;
         if (uLevel > 0) {
-                SCVAL(p,0,lp_major_announce_version());
-                SCVAL(p,1,lp_minor_announce_version());
-                SIVAL(p,2,lp_default_server_announce());
-                SIVAL(p,6,0);
+                SCVAL(p,0,info.info101->version_major);
+                SCVAL(p,1,info.info101->version_minor);
+                SIVAL(p,2,info.info101->server_type);
+
+                if (mdrcnt == struct_len) {
+                        SIVAL(p,6,0);
+                } else {
+                        SIVAL(p,6,PTR_DIFF(p2,*rdata));
+                        if (mdrcnt - struct_len <= 0) {
+                                return false;
+                        }
+                        push_ascii(p2,
+                                info.info101->comment,
+                                MIN(mdrcnt - struct_len,
+                                        MAX_SERVER_STRING_LENGTH),
+                                STR_TERMINATE);
+                        p2 = skip_string(*rdata,*rdata_len,p2);
+                        if (!p2) {
+                                return False;
+                        }
+                }
         }
 
@@ -5583 +5632 @@
         uint32_t totalentries, resume_handle = 0;
         uint32_t count = 0;
-
-#ifndef SRVSVC_SUPPORT
-        return False;
-#endif
 
         if (!str1 || !str2 || !p) {

src/router/samba36/source3/smbd/server_exit.c

@@ -133 +133 @@
 
         if (am_parent) {
-#ifdef WKSSVC_SUPPORT
                 rpc_wkssvc_shutdown();
-#endif
 #ifdef ACTIVE_DIRECTORY
                 rpc_dssetup_shutdown();
@@ -155 +153 @@
 #endif
 
-#ifdef SRVSVC_SUPPORT
                 rpc_srvsvc_shutdown();
-#endif
 #ifdef WINREG_SUPPORT
                 rpc_winreg_shutdown();
@@ -165 +161 @@
                 rpc_netlogon_shutdown();
 #endif
+#ifdef SAMR_SUPPORT
                 rpc_samr_shutdown();
+#endif
                 rpc_lsarpc_shutdown();
         }