Author: metze
Date: 2007-04-12 11:42:09 +0000 (Thu, 12 Apr 2007)
New Revision: 22194

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22194

Log:
fix compiler warning and 
compile in but disable NetShareAddSetDel test

metze
Modified:
   branches/SAMBA_4_0/source/torture/rpc/srvsvc.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/srvsvc.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/srvsvc.c      2007-04-12 11:35:00 UTC 
(rev 22193)
+++ branches/SAMBA_4_0/source/torture/rpc/srvsvc.c      2007-04-12 11:42:09 UTC 
(rev 22194)
@@ -525,6 +525,11 @@
        int i;
        BOOL ret = True;
 
+       if (!lp_parm_bool(-1, "torture", "dangerous", False)) {
+               d_printf("NetShareAddSetDel disabled - enable dangerous tests 
to use\n");
+               return True;
+       }
+
        a.in.server_unc = r.in.server_unc = q.in.server_unc = d.in.server_unc =
                talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
        r.in.share_name = talloc_strdup(mem_ctx, "testshare");
@@ -1047,7 +1052,7 @@
                        }
                }
 
-               talloc_free(r.in.name);
+               talloc_free(name);
 
                d_printf("Maximum length for type %2d, flags %08x: %d\n", i, 
r.in.flags, max);
 
@@ -1056,7 +1061,7 @@
                invalidc = talloc_strdup(mem_ctx, "");
 
                for (n = 0x20; n < 0x7e; n++) {
-                       r.in.name = talloc_asprintf(mem_ctx, "%c", (char)n);
+                       r.in.name = name = talloc_asprintf(mem_ctx, "%c", 
(char)n);
 
                        status = dcerpc_srvsvc_NetNameValidate(p, mem_ctx, &r);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -1069,7 +1074,7 @@
                                invalidc = talloc_asprintf_append(invalidc, 
"%c", (char)n);
                        }
 
-                       talloc_free(r.in.name);
+                       talloc_free(name);
                }
 
                d_printf(" Invalid chars for type %2d, flags %08x: \"%s\"\n", 
i, r.in.flags, invalidc);
@@ -1115,7 +1120,7 @@
        ret &= test_NetRemoteTOD(p, mem_ctx);
        ret &= test_NetShareEnum(p, mem_ctx, True);
        ret &= test_NetShareGetInfo(p, mem_ctx, "ADMIN$", True);
-/*     ret &= test_NetShareAddSetDel(p, mem_ctx); */
+       ret &= test_NetShareAddSetDel(p, mem_ctx);
        ret &= test_NetNameValidate(p, mem_ctx);
        
        status = torture_rpc_connection(mem_ctx, &p, &dcerpc_table_srvsvc);

Reply via email to