[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Thu Feb 10 14:14:01 MST 2011
The branch, master has been updated
via 4063bde s3-rpc_server: move services into individual directories.
via 1fc14a6 s3-waf: do not make pam support mandatory.
from 4de3e73 s3-waf: fix cups checks when lib is there but headers aren't.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4063bde3edd15b241f2b93bb5aedfef57ec4df91
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 8 14:17:14 2011 +0100
s3-rpc_server: move services into individual directories.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Feb 10 22:13:17 CET 2011 on sn-devel-104
commit 1fc14a6543bfc5f087ed0ddf02bc7ce28a4d9ed4
Author: Günther Deschner <gd at samba.org>
Date: Thu Feb 10 21:10:53 2011 +0100
s3-waf: do not make pam support mandatory.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 40 +-
source3/printing/nt_printing.c | 2 +-
source3/printing/nt_printing_ads.c | 2 +-
source3/rpc_server/dfs/srv_dfs_nt.c | 531 +
source3/rpc_server/dssetup/srv_dssetup_nt.c | 224 +
source3/rpc_server/echo/srv_echo_nt.c | 121 +
source3/rpc_server/{ => epmapper}/srv_epmapper.c | 0
.../rpc_server/{ => eventlog}/srv_eventlog_nt.c | 0
source3/rpc_server/eventlog/srv_eventlog_reg.c | 266 +
.../rpc_server/{ => eventlog}/srv_eventlog_reg.h | 0
.../rpc_server/initshutdown/srv_initshutdown_nt.c | 78 +
source3/rpc_server/lsa/srv_lsa_nt.c | 2755 +++++
source3/rpc_server/{ => netlogon}/srv_netlog_nt.c | 0
source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c | 800 ++
source3/rpc_server/samr/srv_samr_chgpasswd.c | 1132 +++
source3/rpc_server/samr/srv_samr_nt.c | 6969 +++++++++++++
source3/rpc_server/samr/srv_samr_util.c | 714 ++
source3/rpc_server/{ => samr}/srv_samr_util.h | 0
source3/rpc_server/spoolss/srv_spoolss_nt.c |10658 ++++++++++++++++++++
source3/rpc_server/spoolss/srv_spoolss_util.c | 4248 ++++++++
.../rpc_server/{ => spoolss}/srv_spoolss_util.h | 0
source3/rpc_server/srv_dfs_nt.c | 531 -
source3/rpc_server/srv_dssetup_nt.c | 225 -
source3/rpc_server/srv_echo_nt.c | 121 -
source3/rpc_server/srv_eventlog_reg.c | 266 -
source3/rpc_server/srv_initshutdown_nt.c | 78 -
source3/rpc_server/srv_lsa_nt.c | 2755 -----
source3/rpc_server/srv_ntsvcs_nt.c | 801 --
source3/rpc_server/srv_rpc_register.c | 4 +-
source3/rpc_server/srv_samr_chgpasswd.c | 1132 ---
source3/rpc_server/srv_samr_nt.c | 6969 -------------
source3/rpc_server/srv_samr_util.c | 714 --
source3/rpc_server/srv_spoolss_nt.c |10658 --------------------
source3/rpc_server/srv_spoolss_util.c | 4249 --------
source3/rpc_server/srv_srvsvc_nt.c | 2820 ------
source3/rpc_server/srv_svcctl_nt.c | 1202 ---
source3/rpc_server/srv_svcctl_reg.c | 678 --
source3/rpc_server/srv_winreg_nt.c | 1142 ---
source3/rpc_server/srv_wkssvc_nt.c | 1020 --
source3/rpc_server/srvsvc/srv_srvsvc_nt.c | 2819 ++++++
source3/rpc_server/svcctl/srv_svcctl_nt.c | 1201 +++
source3/rpc_server/svcctl/srv_svcctl_reg.c | 678 ++
source3/rpc_server/{ => svcctl}/srv_svcctl_reg.h | 0
source3/rpc_server/winreg/srv_winreg_nt.c | 1142 +++
source3/rpc_server/wkssvc/srv_wkssvc_nt.c | 1019 ++
source3/rpc_server/wscript_build | 36 +-
source3/wscript | 16 +-
47 files changed, 35408 insertions(+), 35408 deletions(-)
create mode 100644 source3/rpc_server/dfs/srv_dfs_nt.c
create mode 100644 source3/rpc_server/dssetup/srv_dssetup_nt.c
create mode 100644 source3/rpc_server/echo/srv_echo_nt.c
rename source3/rpc_server/{ => epmapper}/srv_epmapper.c (100%)
rename source3/rpc_server/{ => eventlog}/srv_eventlog_nt.c (100%)
create mode 100644 source3/rpc_server/eventlog/srv_eventlog_reg.c
rename source3/rpc_server/{ => eventlog}/srv_eventlog_reg.h (100%)
create mode 100644 source3/rpc_server/initshutdown/srv_initshutdown_nt.c
create mode 100644 source3/rpc_server/lsa/srv_lsa_nt.c
rename source3/rpc_server/{ => netlogon}/srv_netlog_nt.c (100%)
create mode 100644 source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c
create mode 100644 source3/rpc_server/samr/srv_samr_chgpasswd.c
create mode 100644 source3/rpc_server/samr/srv_samr_nt.c
create mode 100644 source3/rpc_server/samr/srv_samr_util.c
rename source3/rpc_server/{ => samr}/srv_samr_util.h (100%)
create mode 100644 source3/rpc_server/spoolss/srv_spoolss_nt.c
create mode 100644 source3/rpc_server/spoolss/srv_spoolss_util.c
rename source3/rpc_server/{ => spoolss}/srv_spoolss_util.h (100%)
delete mode 100644 source3/rpc_server/srv_dfs_nt.c
delete mode 100644 source3/rpc_server/srv_dssetup_nt.c
delete mode 100644 source3/rpc_server/srv_echo_nt.c
delete mode 100644 source3/rpc_server/srv_eventlog_reg.c
delete mode 100644 source3/rpc_server/srv_initshutdown_nt.c
delete mode 100644 source3/rpc_server/srv_lsa_nt.c
delete mode 100644 source3/rpc_server/srv_ntsvcs_nt.c
delete mode 100644 source3/rpc_server/srv_samr_chgpasswd.c
delete mode 100644 source3/rpc_server/srv_samr_nt.c
delete mode 100644 source3/rpc_server/srv_samr_util.c
delete mode 100644 source3/rpc_server/srv_spoolss_nt.c
delete mode 100644 source3/rpc_server/srv_spoolss_util.c
delete mode 100644 source3/rpc_server/srv_srvsvc_nt.c
delete mode 100644 source3/rpc_server/srv_svcctl_nt.c
delete mode 100644 source3/rpc_server/srv_svcctl_reg.c
delete mode 100644 source3/rpc_server/srv_winreg_nt.c
delete mode 100644 source3/rpc_server/srv_wkssvc_nt.c
create mode 100644 source3/rpc_server/srvsvc/srv_srvsvc_nt.c
create mode 100644 source3/rpc_server/svcctl/srv_svcctl_nt.c
create mode 100644 source3/rpc_server/svcctl/srv_svcctl_reg.c
rename source3/rpc_server/{ => svcctl}/srv_svcctl_reg.h (100%)
create mode 100644 source3/rpc_server/winreg/srv_winreg_nt.c
create mode 100644 source3/rpc_server/wkssvc/srv_wkssvc_nt.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8ad74c4..b632d5d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -662,50 +662,50 @@ LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
DCE_RPC_EP_OBJ = librpc/rpc/dcerpc_ep.o
-RPC_LSARPC_OBJ = rpc_server/srv_lsa_nt.o \
+RPC_LSARPC_OBJ = rpc_server/lsa/srv_lsa_nt.o \
librpc/gen_ndr/srv_lsa.o
-RPC_NETLOGON_OBJ = rpc_server/srv_netlog_nt.o \
+RPC_NETLOGON_OBJ = rpc_server/netlogon/srv_netlog_nt.o \
librpc/gen_ndr/srv_netlogon.o
-RPC_SAMR_OBJ = rpc_server/srv_samr_nt.o \
- rpc_server/srv_samr_util.o \
- rpc_server/srv_samr_chgpasswd.o \
+RPC_SAMR_OBJ = rpc_server/samr/srv_samr_nt.o \
+ rpc_server/samr/srv_samr_util.o \
+ rpc_server/samr/srv_samr_chgpasswd.o \
librpc/gen_ndr/srv_samr.o
-RPC_INITSHUTDOWN_OBJ = librpc/gen_ndr/srv_initshutdown.o rpc_server/srv_initshutdown_nt.o
+RPC_INITSHUTDOWN_OBJ = librpc/gen_ndr/srv_initshutdown.o rpc_server/initshutdown/srv_initshutdown_nt.o
-RPC_WINREG_OBJ = rpc_server/srv_winreg_nt.o \
+RPC_WINREG_OBJ = rpc_server/winreg/srv_winreg_nt.o \
librpc/gen_ndr/srv_winreg.o
-RPC_DSSETUP_OBJ = rpc_server/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
+RPC_DSSETUP_OBJ = rpc_server/dssetup/srv_dssetup_nt.o librpc/gen_ndr/srv_dssetup.o
-RPC_SRVSVC_OBJ = rpc_server/srv_srvsvc_nt.o \
+RPC_SRVSVC_OBJ = rpc_server/srvsvc/srv_srvsvc_nt.o \
librpc/gen_ndr/srv_srvsvc.o
RPC_WKSSVC_OBJ = librpc/gen_ndr/srv_wkssvc.o \
- rpc_server/srv_wkssvc_nt.o
+ rpc_server/wkssvc/srv_wkssvc_nt.o
-RPC_SVCCTL_OBJ = rpc_server/srv_svcctl_nt.o \
- rpc_server/srv_svcctl_reg.o \
+RPC_SVCCTL_OBJ = rpc_server/svcctl/srv_svcctl_nt.o \
+ rpc_server/svcctl/srv_svcctl_reg.o \
librpc/gen_ndr/srv_svcctl.o \
services/svc_winreg_glue.o \
services/svc_spoolss.o services/svc_rcinit.o \
services/svc_netlogon.o services/svc_winreg.o \
services/svc_wins.o
-RPC_NTSVCS_OBJ = rpc_server/srv_ntsvcs_nt.o \
+RPC_NTSVCS_OBJ = rpc_server/ntsvcs/srv_ntsvcs_nt.o \
librpc/gen_ndr/srv_ntsvcs.o
RPC_NETDFS_OBJ = librpc/gen_ndr/srv_dfs.o \
- rpc_server/srv_dfs_nt.o
+ rpc_server/dfs/srv_dfs_nt.o
-RPC_SPOOLSS_OBJ = rpc_server/srv_spoolss_nt.o \
- rpc_server/srv_spoolss_util.o \
+RPC_SPOOLSS_OBJ = rpc_server/spoolss/srv_spoolss_nt.o \
+ rpc_server/spoolss/srv_spoolss_util.o \
librpc/gen_ndr/srv_spoolss.o
-RPC_EVENTLOG_OBJ = rpc_server/srv_eventlog_nt.o \
- rpc_server/srv_eventlog_reg.o \
+RPC_EVENTLOG_OBJ = rpc_server/eventlog/srv_eventlog_nt.o \
+ rpc_server/eventlog/srv_eventlog_reg.o \
$(LIB_EVENTLOG_OBJ) librpc/gen_ndr/srv_eventlog.o
NPA_TSTREAM_OBJ = ../libcli/named_pipe_auth/npa_tstream.o \
@@ -724,9 +724,9 @@ RPC_CRYPTO = rpc_server/dcesrv_ntlmssp.o \
RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \
$(RPC_NCACN_NP) $(RPC_SERVICE) $(RPC_CRYPTO)
-RPC_RPCECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
+RPC_RPCECHO_OBJ = rpc_server/echo/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
-RPC_EPMAPPER_OBJ = rpc_server/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o
+RPC_EPMAPPER_OBJ = rpc_server/epmapper/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o
RPC_SERVER_REGISTER_OBJ = rpc_server/srv_rpc_register.o $(DCE_RPC_EP_OBJ)
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 68be518..67c2d87 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -28,7 +28,7 @@
#include "registry/reg_objects.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "../librpc/gen_ndr/ndr_spoolss.h"
-#include "rpc_server/srv_spoolss_util.h"
+#include "rpc_server/spoolss/srv_spoolss_util.h"
#include "nt_printing.h"
#include "secrets.h"
#include "../librpc/gen_ndr/netlogon.h"
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index 6f71ce0..b375d94 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "../librpc/gen_ndr/spoolss.h"
-#include "rpc_server/srv_spoolss_util.h"
+#include "rpc_server/spoolss/srv_spoolss_util.h"
#include "nt_printing.h"
#include "ads.h"
#include "secrets.h"
diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
new file mode 100644
index 0000000..17b9050
--- /dev/null
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -0,0 +1,531 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * RPC Pipe client / server routines for Dfs
+ * Copyright (C) Shirish Kalele 2000.
+ * Copyright (C) Jeremy Allison 2001-2007.
+ * Copyright (C) Jelmer Vernooij 2005-2006.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* This is the implementation of the dfs pipe. */
+
+#include "includes.h"
+#include "../librpc/gen_ndr/srv_dfs.h"
+
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_MSDFS
+
+/* This function does not return a WERROR or NTSTATUS code but rather 1 if
+ dfs exists, or 0 otherwise. */
+
+void _dfs_GetManagerVersion(struct pipes_struct *p, struct dfs_GetManagerVersion *r)
+{
+ if (lp_host_msdfs()) {
+ *r->out.version = DFS_MANAGER_VERSION_NT4;
+ } else {
+ *r->out.version = (enum dfs_ManagerVersion)0;
+ }
+}
+
+WERROR _dfs_Add(struct pipes_struct *p, struct dfs_Add *r)
+{
+ struct junction_map *jn = NULL;
+ struct referral *old_referral_list = NULL;
+ bool self_ref = False;
+ int consumedcnt = 0;
+ char *altpath = NULL;
+ NTSTATUS status;
+ TALLOC_CTX *ctx = talloc_tos();
+
+ if (p->server_info->utok.uid != sec_initial_uid()) {
+ DEBUG(10,("_dfs_add: uid != 0. Access denied.\n"));
+ return WERR_ACCESS_DENIED;
+ }
+
+ jn = TALLOC_ZERO_P(ctx, struct junction_map);
+ if (!jn) {
+ return WERR_NOMEM;
+ }
+
+ DEBUG(5,("init_reply_dfs_add: Request to add %s -> %s\\%s.\n",
+ r->in.path, r->in.server, r->in.share));
+
+ altpath = talloc_asprintf(ctx, "%s\\%s",
+ r->in.server,
+ r->in.share);
+ if (!altpath) {
+ return WERR_NOMEM;
+ }
+
+ /* The following call can change the cwd. */
+ status = get_referred_path(ctx, r->in.path, jn,
+ &consumedcnt, &self_ref);
+ if(!NT_STATUS_IS_OK(status)) {
+ return ntstatus_to_werror(status);
+ }
+
+ jn->referral_count += 1;
+ old_referral_list = jn->referral_list;
+
+ if (jn->referral_count < 1) {
+ return WERR_NOMEM;
+ }
+
+ jn->referral_list = TALLOC_ARRAY(ctx, struct referral, jn->referral_count);
+ if(jn->referral_list == NULL) {
+ DEBUG(0,("init_reply_dfs_add: talloc failed for referral list!\n"));
+ return WERR_DFS_INTERNAL_ERROR;
+ }
+
+ if(old_referral_list && jn->referral_list) {
+ memcpy(jn->referral_list, old_referral_list,
+ sizeof(struct referral)*jn->referral_count-1);
+ }
+
+ jn->referral_list[jn->referral_count-1].proximity = 0;
+ jn->referral_list[jn->referral_count-1].ttl = REFERRAL_TTL;
+ jn->referral_list[jn->referral_count-1].alternate_path = altpath;
+
+ if(!create_msdfs_link(jn)) {
+ return WERR_DFS_CANT_CREATE_JUNCT;
+ }
+
+ return WERR_OK;
+}
+
+WERROR _dfs_Remove(struct pipes_struct *p, struct dfs_Remove *r)
+{
+ struct junction_map *jn = NULL;
+ bool self_ref = False;
+ int consumedcnt = 0;
+ bool found = False;
+ TALLOC_CTX *ctx = talloc_tos();
+ char *altpath = NULL;
+
+ if (p->server_info->utok.uid != sec_initial_uid()) {
+ DEBUG(10,("_dfs_remove: uid != 0. Access denied.\n"));
+ return WERR_ACCESS_DENIED;
+ }
+
+ jn = TALLOC_ZERO_P(ctx, struct junction_map);
+ if (!jn) {
+ return WERR_NOMEM;
+ }
+
+ if (r->in.servername && r->in.sharename) {
+ altpath = talloc_asprintf(ctx, "%s\\%s",
+ r->in.servername,
+ r->in.sharename);
+ if (!altpath) {
+ return WERR_NOMEM;
+ }
+ strlower_m(altpath);
+ DEBUG(5,("init_reply_dfs_remove: Request to remove %s -> %s\\%s.\n",
+ r->in.dfs_entry_path, r->in.servername, r->in.sharename));
+ }
+
+ if(!NT_STATUS_IS_OK(get_referred_path(ctx, r->in.dfs_entry_path, jn,
+ &consumedcnt, &self_ref))) {
+ return WERR_DFS_NO_SUCH_VOL;
+ }
+
+ /* if no server-share pair given, remove the msdfs link completely */
+ if(!r->in.servername && !r->in.sharename) {
+ if(!remove_msdfs_link(jn)) {
+ return WERR_DFS_NO_SUCH_VOL;
+ }
+ } else {
+ int i=0;
+ /* compare each referral in the list with the one to remove */
+ DEBUG(10,("altpath: .%s. refcnt: %d\n", altpath, jn->referral_count));
+ for(i=0;i<jn->referral_count;i++) {
+ char *refpath = talloc_strdup(ctx,
+ jn->referral_list[i].alternate_path);
+ if (!refpath) {
+ return WERR_NOMEM;
+ }
+ trim_char(refpath, '\\', '\\');
+ DEBUG(10,("_dfs_remove: refpath: .%s.\n", refpath));
+ if(strequal(refpath, altpath)) {
+ *(jn->referral_list[i].alternate_path)='\0';
+ DEBUG(10,("_dfs_remove: Removal request matches referral %s\n",
+ refpath));
+ found = True;
+ }
+ }
+
+ if(!found) {
+ return WERR_DFS_NO_SUCH_SHARE;
+ }
+
+ /* Only one referral, remove it */
+ if(jn->referral_count == 1) {
+ if(!remove_msdfs_link(jn)) {
+ return WERR_DFS_NO_SUCH_VOL;
+ }
+ } else {
+ if(!create_msdfs_link(jn)) {
+ return WERR_DFS_CANT_CREATE_JUNCT;
+ }
+ }
+ }
+
+ return WERR_OK;
+}
+
+static bool init_reply_dfs_info_1(TALLOC_CTX *mem_ctx, struct junction_map* j,struct dfs_Info1* dfs1)
+{
+ dfs1->path = talloc_asprintf(mem_ctx,
+ "\\\\%s\\%s\\%s", global_myname(),
+ j->service_name, j->volume_name);
+ if (dfs1->path == NULL)
+ return False;
+
+ DEBUG(5,("init_reply_dfs_info_1: initing entrypath: %s\n",dfs1->path));
+ return True;
+}
+
+static bool init_reply_dfs_info_2(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info2* dfs2)
+{
+ dfs2->path = talloc_asprintf(mem_ctx,
+ "\\\\%s\\%s\\%s", global_myname(), j->service_name, j->volume_name);
+ if (dfs2->path == NULL)
+ return False;
+ dfs2->comment = talloc_strdup(mem_ctx, j->comment);
+ dfs2->state = 1; /* set up state of dfs junction as OK */
+ dfs2->num_stores = j->referral_count;
+ return True;
+}
+
+static bool init_reply_dfs_info_3(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info3* dfs3)
+{
+ int ii;
+ if (j->volume_name[0] == '\0')
+ dfs3->path = talloc_asprintf(mem_ctx, "\\\\%s\\%s",
+ global_myname(), j->service_name);
+ else
+ dfs3->path = talloc_asprintf(mem_ctx, "\\\\%s\\%s\\%s", global_myname(),
+ j->service_name, j->volume_name);
+
+ if (dfs3->path == NULL)
+ return False;
+
+ dfs3->comment = talloc_strdup(mem_ctx, j->comment);
+ dfs3->state = 1;
+ dfs3->num_stores = j->referral_count;
+
+ /* also enumerate the stores */
+ if (j->referral_count) {
+ dfs3->stores = TALLOC_ARRAY(mem_ctx, struct dfs_StorageInfo, j->referral_count);
+ if (!dfs3->stores)
+ return False;
+ memset(dfs3->stores, '\0', j->referral_count * sizeof(struct dfs_StorageInfo));
+ } else {
+ dfs3->stores = NULL;
+ }
+
+ for(ii=0;ii<j->referral_count;ii++) {
+ char* p;
+ char *path = NULL;
+ struct dfs_StorageInfo* stor = &(dfs3->stores[ii]);
+ struct referral* ref = &(j->referral_list[ii]);
+
+ path = talloc_strdup(mem_ctx, ref->alternate_path);
+ if (!path) {
+ return False;
+ }
+ trim_char(path,'\\','\0');
+ p = strrchr_m(path,'\\');
+ if(p==NULL) {
+ DEBUG(4,("init_reply_dfs_info_3: invalid path: no \\ found in %s\n",path));
+ continue;
+ }
+ *p = '\0';
+ DEBUG(5,("storage %d: %s.%s\n",ii,path,p+1));
+ stor->state = 2; /* set all stores as ONLINE */
+ stor->server = talloc_strdup(mem_ctx, path);
+ stor->share = talloc_strdup(mem_ctx, p+1);
+ }
+ return True;
+}
+
+static bool init_reply_dfs_info_100(TALLOC_CTX *mem_ctx, struct junction_map* j, struct dfs_Info100* dfs100)
+{
+ dfs100->comment = talloc_strdup(mem_ctx, j->comment);
+ return True;
+}
+
+WERROR _dfs_Enum(struct pipes_struct *p, struct dfs_Enum *r)
+{
+ struct junction_map *jn = NULL;
+ size_t num_jn = 0;
+ size_t i;
+ TALLOC_CTX *ctx = talloc_tos();
+
+ jn = enum_msdfs_links(ctx, &num_jn);
+ if (!jn || num_jn == 0) {
+ num_jn = 0;
+ jn = NULL;
+ }
+
+ DEBUG(5,("_dfs_Enum: %u junctions found in Dfs, doing level %d\n",
+ (unsigned int)num_jn, r->in.level));
+
+ *r->out.total = num_jn;
+
+ /* Create the return array */
+ switch (r->in.level) {
+ case 1:
+ if (num_jn) {
+ if ((r->out.info->e.info1->s = TALLOC_ARRAY(ctx, struct dfs_Info1, num_jn)) == NULL) {
+ return WERR_NOMEM;
+ }
+ } else {
+ r->out.info->e.info1->s = NULL;
+ }
+ r->out.info->e.info1->count = num_jn;
+ break;
+ case 2:
+ if (num_jn) {
+ if ((r->out.info->e.info2->s = TALLOC_ARRAY(ctx, struct dfs_Info2, num_jn)) == NULL) {
+ return WERR_NOMEM;
+ }
+ } else {
+ r->out.info->e.info2->s = NULL;
+ }
+ r->out.info->e.info2->count = num_jn;
+ break;
+ case 3:
+ if (num_jn) {
+ if ((r->out.info->e.info3->s = TALLOC_ARRAY(ctx, struct dfs_Info3, num_jn)) == NULL) {
+ return WERR_NOMEM;
+ }
+ } else {
+ r->out.info->e.info3->s = NULL;
+ }
+ r->out.info->e.info3->count = num_jn;
+ break;
+ default:
+ return WERR_INVALID_PARAM;
+ }
+
+ for (i = 0; i < num_jn; i++) {
+ switch (r->in.level) {
+ case 1:
+ init_reply_dfs_info_1(ctx, &jn[i], &r->out.info->e.info1->s[i]);
+ break;
+ case 2:
+ init_reply_dfs_info_2(ctx, &jn[i], &r->out.info->e.info2->s[i]);
+ break;
+ case 3:
+ init_reply_dfs_info_3(ctx, &jn[i], &r->out.info->e.info3->s[i]);
+ break;
+ default:
+ return WERR_INVALID_PARAM;
+ }
+ }
+
+ return WERR_OK;
+}
+
+WERROR _dfs_GetInfo(struct pipes_struct *p, struct dfs_GetInfo *r)
+{
+ int consumedcnt = strlen(r->in.dfs_entry_path);
+ struct junction_map *jn = NULL;
+ bool self_ref = False;
+ TALLOC_CTX *ctx = talloc_tos();
+ bool ret;
+
+ jn = TALLOC_ZERO_P(ctx, struct junction_map);
+ if (!jn) {
+ return WERR_NOMEM;
+ }
+
+ if(!create_junction(ctx, r->in.dfs_entry_path, jn)) {
+ return WERR_DFS_NO_SUCH_SERVER;
+ }
+
+ /* The following call can change the cwd. */
+ if(!NT_STATUS_IS_OK(get_referred_path(ctx, r->in.dfs_entry_path,
+ jn, &consumedcnt, &self_ref)) ||
+ consumedcnt < strlen(r->in.dfs_entry_path)) {
+ return WERR_DFS_NO_SUCH_VOL;
+ }
+
+ switch (r->in.level) {
+ case 1:
+ r->out.info->info1 = TALLOC_ZERO_P(ctx,struct dfs_Info1);
+ if (!r->out.info->info1) {
+ return WERR_NOMEM;
+ }
+ ret = init_reply_dfs_info_1(ctx, jn, r->out.info->info1);
+ break;
+ case 2:
+ r->out.info->info2 = TALLOC_ZERO_P(ctx,struct dfs_Info2);
+ if (!r->out.info->info2) {
+ return WERR_NOMEM;
+ }
+ ret = init_reply_dfs_info_2(ctx, jn, r->out.info->info2);
+ break;
+ case 3:
+ r->out.info->info3 = TALLOC_ZERO_P(ctx,struct dfs_Info3);
--
Samba Shared Repository
More information about the samba-cvs
mailing list