merge from 2.2

(This used to be commit 7db47c6647d764739e395948699cf115c4da4c8d)

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index 6416cfc4ac537a629937687f0a577442da128037..1f3b1945e3570c355981bd1f15556a0cb8da4235 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -352,7 +352,6 @@ static void init_srv_share_info_501(pipes_struct *p, SRV_SHARE_INFO_501 *sh501,
        pstring net_name;
        pstring remark;
        uint32 type;
-       uint32 csc_policy;
 
        pstrcpy(net_name, lp_servicename(snum));
        pstrcpy(remark, lp_comment(snum));