Fix some errors in the srsvc handling code and start running the RPC-SRVSVC

test against samba3.

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0@18823 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/rpc_server/srv_srvsvc_nt.c b/source/rpc_server/srv_srvsvc_nt.c
index d8eb7a662e2ef2f62ce6e1add59b617be63e9c4e..737868f375a7052b53bd9b43f1da7b541c17fbba 100644 (file)
--- a/source/rpc_server/srv_srvsvc_nt.c
+++ b/source/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/source/script/tests/test_posix_s3.sh b/source/script/tests/test_posix_s3.sh
index 998de3b401d3079bbdbcfcb75df3aa7597e1c50d..f079a5a1ebb03857acdc9ae714fb6e1e52b9b1da 100755 (executable)
--- a/source/script/tests/test_posix_s3.sh
+++ b/source/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"