summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-09-22 15:09:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:01:03 -0500
commit387bfebfcf74e4b56b21a772b0e38b6cdb9dcf25 (patch)
treeb130d6362c8f1b68aa7ffd7ddb6436df6656fbb6
parent7fdd258c396ede023e8e5e8067779dc9dfe94ec1 (diff)
downloadsamba-387bfebfcf74e4b56b21a772b0e38b6cdb9dcf25.tar.gz
samba-387bfebfcf74e4b56b21a772b0e38b6cdb9dcf25.tar.bz2
samba-387bfebfcf74e4b56b21a772b0e38b6cdb9dcf25.zip
r18823: Fix some errors in the srsvc handling code and start running the RPC-SRVSVC
test against samba3. (This used to be commit f0508ecb44f13e9e9e521e2534889e98a31d2372)
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c12
-rwxr-xr-xsource3/script/tests/test_posix_s3.sh2
2 files changed, 9 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index d8eb7a662e..737868f375 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -803,7 +803,8 @@ static void init_srv_sess_info_1(pipes_struct *p, struct srvsvc_NetSessCtr1 *ss1
}
if (ss1 == NULL) {
- (*snum) = 0;
+ if (snum != NULL)
+ (*snum) = 0;
return;
}
@@ -867,7 +868,8 @@ static WERROR init_srv_sess_info_ctr(pipes_struct *p, union srvsvc_NetSessCtr *c
break;
default:
DEBUG(5,("init_srv_sess_info_ctr: unsupported switch value %d\n", switch_value));
- (*resume_hnd) = 0;
+ if (resume_hnd != NULL)
+ (*resume_hnd) = 0;
(*total_entries) = 0;
ctr->ctr0 = NULL;
status = WERR_UNKNOWN_LEVEL;
@@ -887,7 +889,8 @@ static void init_srv_conn_info_0(pipes_struct *p, struct srvsvc_NetConnCtr0 *ss0
(*stot) = 1;
if (ss0 == NULL) {
- (*snum) = 0;
+ if (snum != NULL)
+ (*snum) = 0;
return;
}
@@ -928,7 +931,8 @@ static void init_srv_conn_info_1(pipes_struct *p, struct srvsvc_NetConnCtr1 *ss1
(*stot) = 1;
if (ss1 == NULL) {
- (*snum) = 0;
+ if (snum != NULL)
+ (*snum) = 0;
return;
}
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 998de3b401..f079a5a1eb 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -33,7 +33,7 @@ raw="$raw RAW-QFILEINFO RAW-QFSINFO RAW-READ RAW-RENAME RAW-SEARCH RAW-SEEK"
raw="$raw RAW-SFILEINFO RAW-SFILEINFO-BUG RAW-STREAMS RAW-UNLINK RAW-WRITE"
raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH"
-rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-UNIXINFO"
+rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC RPC-UNIXINFO RPC_SRVSVC"
if test x$RUN_FROM_BUILD_FARM = xyes; then
rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME"