Removed unused parameter vuid from rpc_server api_* calls. For the very few

functions that need to access the vuid, it can be obtained from the
current_user global.

Did some whitespace cleanup.
(This used to be commit 738b307bd7053ede369431da7b1349befaa523d9)

9 files changed, 297 insertions, 321 deletions

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index b754dd8525..5440ca1bae 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -204,7 +204,7 @@ struct api_struct
 {  
   char *name;
   uint8 opnum;
-  BOOL (*fn) (uint16 vuid, prs_struct*, prs_struct*);
+  BOOL (*fn) (prs_struct*, prs_struct*);
 };
 
 typedef struct
diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c
index 7094d842b4..81e9b737ee 100644
--- a/source3/rpc_server/srv_lsa.c
+++ b/source3/rpc_server/srv_lsa.c
@@ -1,4 +1,3 @@
-
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
@@ -23,9 +22,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 extern DOM_SID global_sam_sid;
@@ -432,8 +429,7 @@ static BOOL lsa_reply_lookup_names(prs_struct *rdata,
  api_lsa_open_policy2
  ***************************************************************************/
 
-static BOOL api_lsa_open_policy2( uint16 vuid, prs_struct *data,
-                             prs_struct *rdata )
+static BOOL api_lsa_open_policy2(prs_struct *data, prs_struct *rdata)
 {
 	LSA_Q_OPEN_POL2 q_o;
 
@@ -457,8 +453,7 @@ static BOOL api_lsa_open_policy2( uint16 vuid, prs_struct *data,
 /***************************************************************************
 api_lsa_open_policy
  ***************************************************************************/
-static BOOL api_lsa_open_policy( uint16 vuid, prs_struct *data,
-                             prs_struct *rdata )
+static BOOL api_lsa_open_policy(prs_struct *data, prs_struct *rdata)
 {
 	LSA_Q_OPEN_POL q_o;
 
@@ -482,8 +477,7 @@ static BOOL api_lsa_open_policy( uint16 vuid, prs_struct *data,
 /***************************************************************************
 api_lsa_enum_trust_dom
  ***************************************************************************/
-static BOOL api_lsa_enum_trust_dom( uint16 vuid, prs_struct *data,
-                                    prs_struct *rdata )
+static BOOL api_lsa_enum_trust_dom(prs_struct *data, prs_struct *rdata)
 {
 	LSA_Q_ENUM_TRUST_DOM q_e;
 
@@ -501,8 +495,7 @@ static BOOL api_lsa_enum_trust_dom( uint16 vuid, prs_struct *data,
 /***************************************************************************
 api_lsa_query_info
  ***************************************************************************/
-static BOOL api_lsa_query_info( uint16 vuid, prs_struct *data,
-                                prs_struct *rdata )
+static BOOL api_lsa_query_info(prs_struct *data, prs_struct *rdata)
 {
 	LSA_Q_QUERY_INFO q_i;
 	fstring name;
@@ -542,7 +535,7 @@ static BOOL api_lsa_query_info( uint16 vuid, prs_struct *data,
  api_lsa_lookup_sids
  ***************************************************************************/
 
-static BOOL api_lsa_lookup_sids( uint16 vuid, prs_struct *data, prs_struct *rdata )
+static BOOL api_lsa_lookup_sids(prs_struct *data, prs_struct *rdata)
 {
 	LSA_Q_LOOKUP_SIDS q_l;
 	ZERO_STRUCT(q_l);
@@ -564,7 +557,7 @@ static BOOL api_lsa_lookup_sids( uint16 vuid, prs_struct *data, prs_struct *rdat
  api_lsa_lookup_names
  ***************************************************************************/
 
-static BOOL api_lsa_lookup_names( uint16 vuid, prs_struct *data, prs_struct *rdata )
+static BOOL api_lsa_lookup_names(prs_struct *data, prs_struct *rdata)
 {
 	LSA_Q_LOOKUP_NAMES q_l;
 	ZERO_STRUCT(q_l);
@@ -583,8 +576,7 @@ static BOOL api_lsa_lookup_names( uint16 vuid, prs_struct *data, prs_struct *rda
 /***************************************************************************
  api_lsa_close
  ***************************************************************************/
-static BOOL api_lsa_close( uint16 vuid, prs_struct *data,
-                                  prs_struct *rdata)
+static BOOL api_lsa_close(prs_struct *data, prs_struct *rdata)
 {
 	LSA_R_CLOSE r_c;
 
@@ -602,8 +594,7 @@ static BOOL api_lsa_close( uint16 vuid, prs_struct *data,
 /***************************************************************************
  api_lsa_open_secret
  ***************************************************************************/
-static BOOL api_lsa_open_secret( uint16 vuid, prs_struct *data,
-                                  prs_struct *rdata)
+static BOOL api_lsa_open_secret(prs_struct *data, prs_struct *rdata)
 {
 	/* XXXX this is NOT good */
 	size_t i;
diff --git a/source3/rpc_server/srv_netlog.c b/source3/rpc_server/srv_netlog.c
index c0233d80c6..db1a4a9c6b 100644
--- a/source3/rpc_server/srv_netlog.c
+++ b/source3/rpc_server/srv_netlog.c
@@ -1,4 +1,3 @@
-
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
@@ -23,9 +22,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
@@ -302,21 +299,24 @@ static BOOL get_md4pw(char *md4pw, char *mach_name, char *mach_acct)
 	return False;
 }
 
+extern struct current_user current_user; /* To pick up vuid */
+
 /*************************************************************************
  api_net_req_chal:
  *************************************************************************/
 
-static BOOL api_net_req_chal( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_net_req_chal(prs_struct *data, prs_struct *rdata)
 {
 	NET_Q_REQ_CHAL q_r;
 	uint32 status = 0x0;
+        uint16 vuid = current_user.vuid;
 
 	fstring mach_acct;
 	fstring mach_name;
 
 	user_struct *vuser;
 
-	DEBUG(5,("api_net_req_chal(%d): vuid %d\n", __LINE__, (int)vuid));
+ 	DEBUG(5,("api_net_req_chal(%d): vuid %d\n", __LINE__, (int)vuid));
 
 	if ((vuser = get_valid_user_struct(vuid)) == NULL)
 		return False;
@@ -367,8 +367,9 @@ static BOOL api_net_req_chal( uint16 vuid, prs_struct *data, prs_struct *rdata)
  api_net_auth_2:
  *************************************************************************/
 
-static BOOL api_net_auth_2( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_net_auth_2(prs_struct *data, prs_struct *rdata)
 {
+        uint16 vuid = current_user.vuid;
 	NET_Q_AUTH_2 q_a;
 	uint32 status = 0x0;
 
@@ -414,8 +415,9 @@ static BOOL api_net_auth_2( uint16 vuid, prs_struct *data, prs_struct *rdata)
  api_net_srv_pwset:
  *************************************************************************/
 
-static BOOL api_net_srv_pwset( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_net_srv_pwset(prs_struct *data, prs_struct *rdata)
 {
+        uint16 vuid = current_user.vuid;
 	NET_Q_SRV_PWSET q_a;
 	uint32 status = NT_STATUS_WRONG_PASSWORD|0xC0000000;
 	DOM_CRED srv_cred;
@@ -495,8 +497,9 @@ static BOOL api_net_srv_pwset( uint16 vuid, prs_struct *data, prs_struct *rdata)
  api_net_sam_logoff:
  *************************************************************************/
 
-static BOOL api_net_sam_logoff( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_net_sam_logoff(prs_struct *data, prs_struct *rdata)
 {
+        uint16 vuid = current_user.vuid;
 	NET_Q_SAM_LOGOFF q_l;
 	NET_ID_INFO_CTR ctr;	
 
@@ -629,211 +632,216 @@ static uint32 net_login_network(NET_ID_INFO_2 *id2, struct smb_passwd *smb_pass)
  api_net_sam_logon:
  *************************************************************************/
 
-static BOOL api_net_sam_logon( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_net_sam_logon(prs_struct *data, prs_struct *rdata)
 {
-  NET_Q_SAM_LOGON q_l;
-  NET_ID_INFO_CTR ctr;	
-  NET_USER_INFO_3 usr_info;
-  uint32 status = 0x0;
-  DOM_CRED srv_cred;
-  struct smb_passwd *smb_pass = NULL;
-  UNISTR2 *uni_samlogon_user = NULL;
-  fstring nt_username;
-
-  user_struct *vuser = NULL;
-
-  if ((vuser = get_valid_user_struct(vuid)) == NULL)
-    return False;
-
-  memset(&q_l, '\0', sizeof(q_l));
-  memset(&ctr, '\0', sizeof(ctr));
-  memset(&usr_info, '\0', sizeof(usr_info));
-
-  q_l.sam_id.ctr = &ctr;
-
-  if(!net_io_q_sam_logon("", &q_l, data, 0)) {
-    DEBUG(0,("api_net_sam_logon: Failed to unmarshall NET_Q_SAM_LOGON.\n"));
-    return False;
-  }
-
-  /* checks and updates credentials.  creates reply credentials */
-  if (!deal_with_creds(vuser->dc.sess_key, &(vuser->dc.clnt_cred), 
-                       &(q_l.sam_id.client.cred), &srv_cred))
-    status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
-  else
-    memcpy(&(vuser->dc.srv_cred), &(vuser->dc.clnt_cred), sizeof(vuser->dc.clnt_cred));
-
-  /* find the username */
-
-  if (status == 0) {
-    switch (q_l.sam_id.logon_level) {
-      case INTERACTIVE_LOGON_TYPE:
-        uni_samlogon_user = &q_l.sam_id.ctr->auth.id1.uni_user_name;
-
-        DEBUG(3,("SAM Logon (Interactive). Domain:[%s].  ", lp_workgroup()));
-        break;
-      case NET_LOGON_TYPE:
-        uni_samlogon_user = &q_l.sam_id.ctr->auth.id2.uni_user_name;
-
-        DEBUG(3,("SAM Logon (Network). Domain:[%s].  ", lp_workgroup()));
-        break;
-      default:
-        DEBUG(2,("SAM Logon: unsupported switch value\n"));
-        status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
-        break;
-    } /* end switch */
-  } /* end if status == 0 */
-
-  /* check username exists */
-
-  if (status == 0) {
-    pstrcpy(nt_username, dos_unistrn2(uni_samlogon_user->buffer,
-            uni_samlogon_user->uni_str_len));
-
-    DEBUG(3,("User:[%s]\n", nt_username));
-
-    /*
-     * Convert to a UNIX username.
-     */
-    map_username(nt_username);
-
-    /*
-     * Do any case conversions.
-     */
-    (void)Get_Pwnam(nt_username, True);
-
-    become_root(True);
-    smb_pass = getsmbpwnam(nt_username);
-    unbecome_root(True);
-
-    if (smb_pass == NULL)
-      status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-    else if (smb_pass->acct_ctrl & ACB_PWNOTREQ)
-      status = 0;
-    else if (smb_pass->acct_ctrl & ACB_DISABLED)
-      status =  0xC0000000 | NT_STATUS_ACCOUNT_DISABLED;
-  }
-
-  /* Validate password - if required. */
-
-  if ((status == 0) && !(smb_pass->acct_ctrl & ACB_PWNOTREQ)) {
-    switch (q_l.sam_id.logon_level) {
-      case INTERACTIVE_LOGON_TYPE:
-        /* interactive login. */
-        status = net_login_interactive(&q_l.sam_id.ctr->auth.id1, smb_pass, vuser);
-        break;
-      case NET_LOGON_TYPE:
-        /* network login.  lm challenge and 24 byte responses */
-        status = net_login_network(&q_l.sam_id.ctr->auth.id2, smb_pass);
-        break;
+    uint16 vuid = current_user.vuid;
+    NET_Q_SAM_LOGON q_l;
+    NET_ID_INFO_CTR ctr;	
+    NET_USER_INFO_3 usr_info;
+    uint32 status = 0x0;
+    DOM_CRED srv_cred;
+    struct smb_passwd *smb_pass = NULL;
+    UNISTR2 *uni_samlogon_user = NULL;
+    fstring nt_username;
+    
+    user_struct *vuser = NULL;
+    
+    if ((vuser = get_valid_user_struct(vuid)) == NULL)
+        return False;
+    
+    memset(&q_l, '\0', sizeof(q_l));
+    memset(&ctr, '\0', sizeof(ctr));
+    memset(&usr_info, '\0', sizeof(usr_info));
+    
+    q_l.sam_id.ctr = &ctr;
+    
+    if(!net_io_q_sam_logon("", &q_l, data, 0)) {
+        DEBUG(0,
+              ("api_net_sam_logon: Failed to unmarshall NET_Q_SAM_LOGON.\n"));
+        return False;
     }
-  }
-	
-  /* lkclXXXX this is the point at which, if the login was
-     successful, that the SAM Local Security Authority should
-     record that the user is logged in to the domain.
-   */
-
-  /* return the profile plus other bits :-) */
-
-  if (status == 0) {
-    DOM_GID *gids = NULL;
-    int num_gids = 0;
-    NTTIME dummy_time;
-    pstring logon_script;
-    pstring profile_path;
-    pstring home_dir;
-    pstring home_drive;
-    pstring my_name;
-    pstring my_workgroup;
-    pstring domain_groups;
-    uint32 r_uid;
-    uint32 r_gid;
-
-    /* set up pointer indicating user/password failed to be found */
-    usr_info.ptr_user_info = 0;
-
-    dummy_time.low  = 0xffffffff;
-    dummy_time.high = 0x7fffffff;
-
-    /* XXXX hack to get standard_sub_basic() to use sam logon username */
-    /* possibly a better way would be to do a become_user() call */
-    sam_logon_in_ssb = True;
-    pstrcpy(samlogon_user, nt_username);
-
-    pstrcpy(logon_script, lp_logon_script());
-    pstrcpy(profile_path, lp_logon_path());
-
-    pstrcpy(my_workgroup, lp_workgroup());
-
-    pstrcpy(home_drive, lp_logon_drive());
-    pstrcpy(home_dir, lp_logon_home());
-
-    pstrcpy(my_name, global_myname);
-    strupper(my_name);
-
-    /*
-     * This is the point at which we get the group
-     * database - we should be getting the gid_t list
-     * from /etc/group and then turning the uids into
-     * rids and then into machine sids for this user.
-     * JRA.
-     */
-
-    get_domain_user_groups(domain_groups, nt_username);
-
-    /*
-     * make_dom_gids allocates the gids array. JRA.
-     */
-    gids = NULL;
-    num_gids = make_dom_gids(domain_groups, &gids);
-
-    sam_logon_in_ssb = False;
-
-    if (pdb_name_to_rid(nt_username, &r_uid, &r_gid))
-      init_net_user_info3(&usr_info,
-                          &dummy_time, /* logon_time */
-                          &dummy_time, /* logoff_time */
-                          &dummy_time, /* kickoff_time */
-                          &dummy_time, /* pass_last_set_time */
-                          &dummy_time, /* pass_can_change_time */
-                          &dummy_time, /* pass_must_change_time */
-
-                          nt_username   , /* user_name */
-                          vuser->real_name, /* full_name */
-                          logon_script    , /* logon_script */
-                          profile_path    , /* profile_path */
-                          home_dir        , /* home_dir */
-                          home_drive      , /* dir_drive */
-
-                          0, /* logon_count */
-                          0, /* bad_pw_count */
-
-                          r_uid   , /* RID user_id */
-                          r_gid   , /* RID group_id */
-                          num_gids,    /* uint32 num_groups */
-                          gids    , /* DOM_GID *gids */
-                          0x20    , /* uint32 user_flgs (?) */
-
-                          NULL, /* char sess_key[16] */
-
-                          my_name     , /* char *logon_srv */
-                          my_workgroup, /* char *logon_dom */
-
-                          &global_sam_sid,     /* DOM_SID *dom_sid */
-                          NULL); /* char *other_sids */
+    
+    /* checks and updates credentials.  creates reply credentials */
+    if (!deal_with_creds(vuser->dc.sess_key, &(vuser->dc.clnt_cred), 
+                         &(q_l.sam_id.client.cred), &srv_cred))
+        status = 0xC0000000 | NT_STATUS_INVALID_HANDLE;
     else
-      status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
-
-    /* Free any allocated groups array. */
-    if(gids)
-      free((char *)gids);
-  }
+        memcpy(&(vuser->dc.srv_cred), &(vuser->dc.clnt_cred), 
+               sizeof(vuser->dc.clnt_cred));
+    
+    /* find the username */
+    
+    if (status == 0) {
+        switch (q_l.sam_id.logon_level) {
+        case INTERACTIVE_LOGON_TYPE:
+            uni_samlogon_user = &q_l.sam_id.ctr->auth.id1.uni_user_name;
+            
+            DEBUG(3,("SAM Logon (Interactive). Domain:[%s].  ", 
+                     lp_workgroup()));
+            break;
+        case NET_LOGON_TYPE:
+            uni_samlogon_user = &q_l.sam_id.ctr->auth.id2.uni_user_name;
+            
+            DEBUG(3,("SAM Logon (Network). Domain:[%s].  ", lp_workgroup()));
+            break;
+        default:
+            DEBUG(2,("SAM Logon: unsupported switch value\n"));
+            status = 0xC0000000 | NT_STATUS_INVALID_INFO_CLASS;
+            break;
+        } /* end switch */
+    } /* end if status == 0 */
 
-  if(!net_reply_sam_logon(&q_l, rdata, &srv_cred, &usr_info, status))
-    return False;
+  /* check username exists */
 
-  return True;
+    if (status == 0) {
+        pstrcpy(nt_username, dos_unistrn2(uni_samlogon_user->buffer,
+                                          uni_samlogon_user->uni_str_len));
+
+        DEBUG(3,("User:[%s]\n", nt_username));
+        
+        /*
+         * Convert to a UNIX username.
+         */
+        map_username(nt_username);
+
+        /*
+         * Do any case conversions.
+         */
+        (void)Get_Pwnam(nt_username, True);
+        
+        become_root(True);
+        smb_pass = getsmbpwnam(nt_username);
+        unbecome_root(True);
+        
+        if (smb_pass == NULL)
+            status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+        else if (smb_pass->acct_ctrl & ACB_PWNOTREQ)
+            status = 0;
+        else if (smb_pass->acct_ctrl & ACB_DISABLED)
+            status =  0xC0000000 | NT_STATUS_ACCOUNT_DISABLED;
+    }
+    
+    /* Validate password - if required. */
+    
+    if ((status == 0) && !(smb_pass->acct_ctrl & ACB_PWNOTREQ)) {
+        switch (q_l.sam_id.logon_level) {
+        case INTERACTIVE_LOGON_TYPE:
+            /* interactive login. */
+            status = net_login_interactive(&q_l.sam_id.ctr->auth.id1, 
+                                           smb_pass, vuser);
+            break;
+        case NET_LOGON_TYPE:
+            /* network login.  lm challenge and 24 byte responses */
+            status = net_login_network(&q_l.sam_id.ctr->auth.id2, smb_pass);
+            break;
+        }
+    }
+    
+    /* lkclXXXX this is the point at which, if the login was
+       successful, that the SAM Local Security Authority should
+       record that the user is logged in to the domain.
+    */
+    
+    /* return the profile plus other bits :-) */
+    
+    if (status == 0) {
+        DOM_GID *gids = NULL;
+        int num_gids = 0;
+        NTTIME dummy_time;
+        pstring logon_script;
+        pstring profile_path;
+        pstring home_dir;
+        pstring home_drive;
+        pstring my_name;
+        pstring my_workgroup;
+        pstring domain_groups;
+        uint32 r_uid;
+        uint32 r_gid;
+        
+        /* set up pointer indicating user/password failed to be found */
+        usr_info.ptr_user_info = 0;
+        
+        dummy_time.low  = 0xffffffff;
+        dummy_time.high = 0x7fffffff;
+        
+        /* XXXX hack to get standard_sub_basic() to use sam logon username */
+        /* possibly a better way would be to do a become_user() call */
+        sam_logon_in_ssb = True;
+        pstrcpy(samlogon_user, nt_username);
+        
+        pstrcpy(logon_script, lp_logon_script());
+        pstrcpy(profile_path, lp_logon_path());
+        
+        pstrcpy(my_workgroup, lp_workgroup());
+        
+        pstrcpy(home_drive, lp_logon_drive());
+        pstrcpy(home_dir, lp_logon_home());
+        
+        pstrcpy(my_name, global_myname);
+        strupper(my_name);
+        
+        /*
+         * This is the point at which we get the group
+         * database - we should be getting the gid_t list
+         * from /etc/group and then turning the uids into
+         * rids and then into machine sids for this user.
+         * JRA.
+         */
+        
+        get_domain_user_groups(domain_groups, nt_username);
+        
+        /*
+         * make_dom_gids allocates the gids array. JRA.
+         */
+        gids = NULL;
+        num_gids = make_dom_gids(domain_groups, &gids);
+        
+        sam_logon_in_ssb = False;
+        
+        if (pdb_name_to_rid(nt_username, &r_uid, &r_gid))
+            init_net_user_info3(&usr_info,
+                                &dummy_time, /* logon_time */
+                                &dummy_time, /* logoff_time */
+                                &dummy_time, /* kickoff_time */
+                                &dummy_time, /* pass_last_set_time */
+                                &dummy_time, /* pass_can_change_time */
+                                &dummy_time, /* pass_must_change_time */
+                                
+                                nt_username   , /* user_name */
+                                vuser->real_name, /* full_name */
+                                logon_script    , /* logon_script */
+                                profile_path    , /* profile_path */
+                                home_dir        , /* home_dir */
+                                home_drive      , /* dir_drive */
+                                
+                                0, /* logon_count */
+                                0, /* bad_pw_count */
+                                
+                                r_uid   , /* RID user_id */
+                                r_gid   , /* RID group_id */
+                                num_gids,    /* uint32 num_groups */
+                                gids    , /* DOM_GID *gids */
+                                0x20    , /* uint32 user_flgs (?) */
+                                
+                                NULL, /* char sess_key[16] */
+                                
+                                my_name     , /* char *logon_srv */
+                                my_workgroup, /* char *logon_dom */
+                                
+                                &global_sam_sid,     /* DOM_SID *dom_sid */
+                                NULL); /* char *other_sids */
+        else
+            status = 0xC0000000 | NT_STATUS_NO_SUCH_USER;
+        
+        /* Free any allocated groups array. */
+        if(gids)
+            free((char *)gids);
+    }
+    
+    if(!net_reply_sam_logon(&q_l, rdata, &srv_cred, &usr_info, status))
+        return False;
+    
+    return True;
 }
 
 
@@ -841,10 +849,9 @@ static BOOL api_net_sam_logon( uint16 vuid, prs_struct *data, prs_struct *rdata)
  api_net_trust_dom_list:
  *************************************************************************/
 
-static BOOL api_net_trust_dom_list( uint16 vuid,
-                                 prs_struct *data,
-                                 prs_struct *rdata)
+static BOOL api_net_trust_dom_list(prs_struct *data, prs_struct *rdata)
 {
+        uint16 vuid = current_user.vuid;
 	NET_Q_TRUST_DOM_LIST q_t;
 
 	char *trusted_domain = "test_domain";
@@ -877,10 +884,9 @@ static BOOL api_net_trust_dom_list( uint16 vuid,
  api_net_logon_ctrl2:
  *************************************************************************/
 
-static BOOL api_net_logon_ctrl2( uint16 vuid,
-                                 prs_struct *data,
-                                 prs_struct *rdata)
+static BOOL api_net_logon_ctrl2(prs_struct *data, prs_struct *rdata)
 {
+        uint16 vuid = current_user.vuid;
 	NET_Q_LOGON_CTRL2 q_l;
 
 	/* lkclXXXX - guess what - absolutely no idea what these are! */
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 9a17862bd5..ebb38154d3 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -1099,7 +1099,7 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds
 	}
 
 	/* do the actual command */
-	if(!api_rpc_cmds[fn_num].fn(p->vuid, rpc_in, &p->out_data.rdata)) {
+	if(!api_rpc_cmds[fn_num].fn(rpc_in, &p->out_data.rdata)) {
 		DEBUG(0,("api_rpcTNP: %s: failed.\n", rpc_name));
 		prs_mem_free(&p->out_data.rdata);
 		return False;
diff --git a/source3/rpc_server/srv_reg.c b/source3/rpc_server/srv_reg.c
index f2083fa22f..b1d3784ec1 100644
--- a/source3/rpc_server/srv_reg.c
+++ b/source3/rpc_server/srv_reg.c
@@ -22,13 +22,10 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
-
 /*******************************************************************
  reg_reply_unknown_1
  ********************************************************************/
@@ -61,8 +58,7 @@ static void reg_reply_close(REG_Q_CLOSE *q_r,
 /*******************************************************************
  api_reg_close
  ********************************************************************/
-static BOOL api_reg_close( uint16 vuid, prs_struct *data,
-                                    prs_struct *rdata )
+static BOOL api_reg_close(prs_struct *data, prs_struct *rdata)
 {
 	REG_Q_CLOSE q_r;
 
@@ -102,8 +98,7 @@ static void reg_reply_open(REG_Q_OPEN_HKLM *q_r,
 /*******************************************************************
  api_reg_open
  ********************************************************************/
-static BOOL api_reg_open( uint16 vuid, prs_struct *data,
-                                    prs_struct *rdata )
+static BOOL api_reg_open(prs_struct *data, prs_struct *rdata)
 {
 	REG_Q_OPEN_HKLM q_u;
 
@@ -168,8 +163,7 @@ static void reg_reply_open_entry(REG_Q_OPEN_ENTRY *q_u,
 /*******************************************************************
  api_reg_open_entry
  ********************************************************************/
-static BOOL api_reg_open_entry( uint16 vuid, prs_struct *data,
-                                    prs_struct *rdata )
+static BOOL api_reg_open_entry(prs_struct *data, prs_struct *rdata)
 {
 	REG_Q_OPEN_ENTRY q_u;
 
@@ -218,8 +212,7 @@ static void reg_reply_info(REG_Q_INFO *q_u,
 /*******************************************************************
  api_reg_info
  ********************************************************************/
-static BOOL api_reg_info( uint16 vuid, prs_struct *data,
-                                    prs_struct *rdata )
+static BOOL api_reg_info(prs_struct *data, prs_struct *rdata)
 {
 	REG_Q_INFO q_u;
 
@@ -252,4 +245,3 @@ BOOL api_reg_rpc(pipes_struct *p, prs_struct *data)
 {
 	return api_rpcTNP(p, "api_reg_rpc", api_reg_cmds, data);
 }
-
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index a99e2a2734..88a7f54efa 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -1,4 +1,3 @@
-
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
@@ -23,9 +22,7 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
@@ -364,7 +361,7 @@ static void samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u,
 /*******************************************************************
  api_samr_close_hnd
  ********************************************************************/
-static BOOL api_samr_close_hnd( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_close_hnd(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_CLOSE_HND q_u;
 
@@ -425,7 +422,7 @@ static void samr_reply_open_domain(SAMR_Q_OPEN_DOMAIN *q_u,
 /*******************************************************************
  api_samr_open_domain
  ********************************************************************/
-static BOOL api_samr_open_domain( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_domain(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_OPEN_DOMAIN q_u;
 
@@ -474,7 +471,7 @@ static void samr_reply_unknown_2c(SAMR_Q_UNKNOWN_2C *q_u,
 /*******************************************************************
  api_samr_unknown_2c
  ********************************************************************/
-static BOOL api_samr_unknown_2c( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_2c(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_UNKNOWN_2C q_u;
 
@@ -552,7 +549,7 @@ static void samr_reply_unknown_3(SAMR_Q_UNKNOWN_3 *q_u,
 /*******************************************************************
  api_samr_unknown_3
  ********************************************************************/
-static BOOL api_samr_unknown_3( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_3(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_UNKNOWN_3 q_u;
 
@@ -606,7 +603,7 @@ static void samr_reply_enum_dom_users(SAMR_Q_ENUM_DOM_USERS *q_u,
 /*******************************************************************
  api_samr_enum_dom_users
  ********************************************************************/
-static BOOL api_samr_enum_dom_users( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_users(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_ENUM_DOM_USERS q_e;
 
@@ -663,7 +660,7 @@ static void samr_reply_enum_dom_groups(SAMR_Q_ENUM_DOM_GROUPS *q_u,
 /*******************************************************************
  api_samr_enum_dom_groups
  ********************************************************************/
-static BOOL api_samr_enum_dom_groups( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_groups(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_ENUM_DOM_GROUPS q_e;
 
@@ -747,7 +744,7 @@ static void samr_reply_enum_dom_aliases(SAMR_Q_ENUM_DOM_ALIASES *q_u,
 /*******************************************************************
  api_samr_enum_dom_aliases
  ********************************************************************/
-static BOOL api_samr_enum_dom_aliases( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_enum_dom_aliases(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_ENUM_DOM_ALIASES q_e;
 
@@ -839,7 +836,7 @@ static void samr_reply_query_dispinfo(SAMR_Q_QUERY_DISPINFO *q_u,
 /*******************************************************************
  api_samr_query_dispinfo
  ********************************************************************/
-static BOOL api_samr_query_dispinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_dispinfo(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_QUERY_DISPINFO q_e;
 
@@ -894,7 +891,7 @@ static void samr_reply_query_aliasinfo(SAMR_Q_QUERY_ALIASINFO *q_u,
 /*******************************************************************
  api_samr_query_aliasinfo
  ********************************************************************/
-static BOOL api_samr_query_aliasinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_aliasinfo(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_QUERY_ALIASINFO q_e;
 
@@ -973,7 +970,7 @@ static void samr_reply_lookup_ids(SAMR_Q_LOOKUP_IDS *q_u,
 /*******************************************************************
  api_samr_lookup_ids
  ********************************************************************/
-static BOOL api_samr_lookup_ids( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_lookup_ids(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_LOOKUP_IDS q_u;
 
@@ -1062,7 +1059,7 @@ static BOOL samr_reply_lookup_names(SAMR_Q_LOOKUP_NAMES *q_u,
  api_samr_lookup_names
  ********************************************************************/
 
-static BOOL api_samr_lookup_names( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_lookup_names(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_LOOKUP_NAMES q_u;
 
@@ -1121,7 +1118,7 @@ static BOOL samr_reply_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u,
  api_samr_chgpasswd_user
  ********************************************************************/
 
-static BOOL api_samr_chgpasswd_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_chgpasswd_user(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_CHGPASSWD_USER q_u;
 
@@ -1162,7 +1159,7 @@ static void samr_reply_unknown_38(SAMR_Q_UNKNOWN_38 *q_u,
 /*******************************************************************
  api_samr_unknown_38
  ********************************************************************/
-static BOOL api_samr_unknown_38( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_38(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_UNKNOWN_38 q_u;
 
@@ -1225,7 +1222,7 @@ static void samr_reply_unknown_12(SAMR_Q_UNKNOWN_12 *q_u,
 /*******************************************************************
  api_samr_unknown_12
  ********************************************************************/
-static BOOL api_samr_unknown_12( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_12(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_UNKNOWN_12 q_u;
 
@@ -1301,7 +1298,7 @@ static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u,
 /*******************************************************************
  api_samr_open_user
  ********************************************************************/
-static BOOL api_samr_open_user( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_user(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_OPEN_USER q_u;
 
@@ -1506,7 +1503,7 @@ static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
 /*******************************************************************
  api_samr_query_userinfo
  ********************************************************************/
-static BOOL api_samr_query_userinfo( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_userinfo(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_QUERY_USERINFO q_u;
 
@@ -1586,7 +1583,7 @@ static void samr_reply_query_usergroups(SAMR_Q_QUERY_USERGROUPS *q_u,
 /*******************************************************************
  api_samr_query_usergroups
  ********************************************************************/
-static BOOL api_samr_query_usergroups( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_usergroups(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_QUERY_USERGROUPS q_u;
 	/* grab the samr unknown 32 */
@@ -1655,7 +1652,7 @@ static void samr_reply_query_dom_info(SAMR_Q_QUERY_DOMAIN_INFO *q_u,
 /*******************************************************************
  api_samr_query_dom_info
  ********************************************************************/
-static BOOL api_samr_query_dom_info( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_query_dom_info(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_QUERY_DOMAIN_INFO q_e;
 
@@ -1705,7 +1702,7 @@ static void samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u,
 /*******************************************************************
  api_samr_unknown_32
  ********************************************************************/
-static BOOL api_samr_unknown_32( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_unknown_32(prs_struct *data, prs_struct *rdata)
 {
 	uint32 status = 0;
 	struct sam_passwd *sam_pass;
@@ -1790,7 +1787,7 @@ static void samr_reply_connect_anon(SAMR_Q_CONNECT_ANON *q_u,
 /*******************************************************************
  api_samr_connect_anon
  ********************************************************************/
-static BOOL api_samr_connect_anon( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_connect_anon(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_CONNECT_ANON q_u;
 
@@ -1845,7 +1842,7 @@ static void samr_reply_connect(SAMR_Q_CONNECT *q_u,
 /*******************************************************************
  api_samr_connect
  ********************************************************************/
-static BOOL api_samr_connect( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_connect(prs_struct *data, prs_struct *rdata)
 {
 	SAMR_Q_CONNECT q_u;
 
@@ -1900,7 +1897,7 @@ static void samr_reply_open_alias(SAMR_Q_OPEN_ALIAS *q_u,
 /*******************************************************************
  api_samr_open_alias
  ********************************************************************/
-static BOOL api_samr_open_alias( uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_samr_open_alias(prs_struct *data, prs_struct *rdata)
                                 
 {
 	SAMR_Q_OPEN_ALIAS q_u;
diff --git a/source3/rpc_server/srv_spoolss.c b/source3/rpc_server/srv_spoolss.c
index 1649df8608..f23422d87a 100755
--- a/source3/rpc_server/srv_spoolss.c
+++ b/source3/rpc_server/srv_spoolss.c
@@ -22,14 +22,13 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
 /********************************************************************
  * api_spoolss_open_printer_ex
  ********************************************************************/
-static BOOL api_spoolss_open_printer_ex(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_open_printer_ex(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_OPEN_PRINTER_EX q_u;
 	SPOOL_R_OPEN_PRINTER_EX r_u;
@@ -64,7 +63,7 @@ static BOOL api_spoolss_open_printer_ex(uint16 vuid, prs_struct *data, prs_struc
  *
  * called from the spoolss dispatcher
  ********************************************************************/
-static BOOL api_spoolss_getprinterdata(uint16 vuid, prs_struct *data, prs_struct *rdata) 
+static BOOL api_spoolss_getprinterdata(prs_struct *data, prs_struct *rdata) 
 {
 	SPOOL_Q_GETPRINTERDATA q_u;
 	SPOOL_R_GETPRINTERDATA r_u;
@@ -97,7 +96,7 @@ static BOOL api_spoolss_getprinterdata(uint16 vuid, prs_struct *data, prs_struct
  *
  * called from the spoolss dispatcher
  ********************************************************************/
-static BOOL api_spoolss_closeprinter(uint16 vuid, prs_struct *data, prs_struct *rdata) 
+static BOOL api_spoolss_closeprinter(prs_struct *data, prs_struct *rdata) 
 {
 	SPOOL_Q_CLOSEPRINTER q_u;
 	SPOOL_R_CLOSEPRINTER r_u;
@@ -125,7 +124,7 @@ static BOOL api_spoolss_closeprinter(uint16 vuid, prs_struct *data, prs_struct *
  * api_spoolss_rffpcnex
  * ReplyFindFirstPrinterChangeNotifyEx
  ********************************************************************/
-static BOOL api_spoolss_rffpcnex(uint16 vuid, prs_struct *data, prs_struct *rdata) 
+static BOOL api_spoolss_rffpcnex(prs_struct *data, prs_struct *rdata) 
 {
 	SPOOL_Q_RFFPCNEX q_u;
 	SPOOL_R_RFFPCNEX r_u;
@@ -157,7 +156,7 @@ static BOOL api_spoolss_rffpcnex(uint16 vuid, prs_struct *data, prs_struct *rdat
  * called from the spoolss dispatcher
  *
  ********************************************************************/
-static BOOL api_spoolss_rfnpcnex(uint16 vuid, prs_struct *data, prs_struct *rdata) 
+static BOOL api_spoolss_rfnpcnex(prs_struct *data, prs_struct *rdata) 
 {
 	SPOOL_Q_RFNPCNEX q_u;
 	SPOOL_R_RFNPCNEX r_u;
@@ -192,7 +191,7 @@ static BOOL api_spoolss_rfnpcnex(uint16 vuid, prs_struct *data, prs_struct *rdat
  * called from the spoolss dispatcher
  *
  ********************************************************************/
-static BOOL api_spoolss_enumprinters(uint16 vuid, prs_struct *data, prs_struct *rdata) 
+static BOOL api_spoolss_enumprinters(prs_struct *data, prs_struct *rdata) 
 {
 	SPOOL_Q_ENUMPRINTERS q_u;
 	SPOOL_R_ENUMPRINTERS r_u;
@@ -230,7 +229,7 @@ static BOOL api_spoolss_enumprinters(uint16 vuid, prs_struct *data, prs_struct *
  * called from the spoolss dispatcher
  *
  ********************************************************************/
-static BOOL api_spoolss_getprinter(uint16 vuid, prs_struct *data, prs_struct *rdata) 
+static BOOL api_spoolss_getprinter(prs_struct *data, prs_struct *rdata) 
 {
 	SPOOL_Q_GETPRINTER q_u;
 	SPOOL_R_GETPRINTER r_u;
@@ -268,7 +267,7 @@ static BOOL api_spoolss_getprinter(uint16 vuid, prs_struct *data, prs_struct *rd
  * called from the spoolss dispatcher
  *
  ********************************************************************/
-static BOOL api_spoolss_getprinterdriver2(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_getprinterdriver2(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_GETPRINTERDRIVER2 q_u;
 	SPOOL_R_GETPRINTERDRIVER2 r_u;
@@ -306,7 +305,7 @@ static BOOL api_spoolss_getprinterdriver2(uint16 vuid, prs_struct *data, prs_str
  * called from the spoolss dispatcher
  *
  ********************************************************************/
-static BOOL api_spoolss_startpageprinter(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_startpageprinter(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_STARTPAGEPRINTER q_u;
 	SPOOL_R_STARTPAGEPRINTER r_u;
@@ -335,7 +334,7 @@ static BOOL api_spoolss_startpageprinter(uint16 vuid, prs_struct *data, prs_stru
  * called from the spoolss dispatcher
  *
  ********************************************************************/
-static BOOL api_spoolss_endpageprinter(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_endpageprinter(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENDPAGEPRINTER q_u;
 	SPOOL_R_ENDPAGEPRINTER r_u;
@@ -360,7 +359,7 @@ static BOOL api_spoolss_endpageprinter(uint16 vuid, prs_struct *data, prs_struct
 
 /********************************************************************
 ********************************************************************/
-static BOOL api_spoolss_startdocprinter(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_startdocprinter(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_STARTDOCPRINTER q_u;
 	SPOOL_R_STARTDOCPRINTER r_u;
@@ -389,7 +388,7 @@ static BOOL api_spoolss_startdocprinter(uint16 vuid, prs_struct *data, prs_struc
 
 /********************************************************************
 ********************************************************************/
-static BOOL api_spoolss_enddocprinter(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enddocprinter(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENDDOCPRINTER q_u;
 	SPOOL_R_ENDDOCPRINTER r_u;
@@ -415,7 +414,7 @@ static BOOL api_spoolss_enddocprinter(uint16 vuid, prs_struct *data, prs_struct
 
 /********************************************************************
 ********************************************************************/
-static BOOL api_spoolss_writeprinter(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_writeprinter(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_WRITEPRINTER q_u;
 	SPOOL_R_WRITEPRINTER r_u;
@@ -446,7 +445,7 @@ static BOOL api_spoolss_writeprinter(uint16 vuid, prs_struct *data, prs_struct *
 /****************************************************************************
 
 ****************************************************************************/
-static BOOL api_spoolss_setprinter(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_setprinter(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_SETPRINTER q_u;
 	SPOOL_R_SETPRINTER r_u;
@@ -479,7 +478,7 @@ static BOOL api_spoolss_setprinter(uint16 vuid, prs_struct *data, prs_struct *rd
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_fcpn(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_fcpn(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_FCPN q_u;
 	SPOOL_R_FCPN r_u;
@@ -505,7 +504,7 @@ static BOOL api_spoolss_fcpn(uint16 vuid, prs_struct *data, prs_struct *rdata)
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_addjob(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_addjob(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ADDJOB q_u;
 	SPOOL_R_ADDJOB r_u;
@@ -539,7 +538,7 @@ static BOOL api_spoolss_addjob(uint16 vuid, prs_struct *data, prs_struct *rdata)
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_enumjobs(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumjobs(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMJOBS q_u;
 	SPOOL_R_ENUMJOBS r_u;
@@ -575,7 +574,7 @@ static BOOL api_spoolss_enumjobs(uint16 vuid, prs_struct *data, prs_struct *rdat
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_schedulejob(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_schedulejob(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_SCHEDULEJOB q_u;
 	SPOOL_R_SCHEDULEJOB r_u;
@@ -600,7 +599,7 @@ static BOOL api_spoolss_schedulejob(uint16 vuid, prs_struct *data, prs_struct *r
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_setjob(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_setjob(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_SETJOB q_u;
 	SPOOL_R_SETJOB r_u;
@@ -627,7 +626,7 @@ static BOOL api_spoolss_setjob(uint16 vuid, prs_struct *data, prs_struct *rdata)
 /****************************************************************************
 ****************************************************************************/
 
-static BOOL api_spoolss_enumprinterdrivers(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumprinterdrivers(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMPRINTERDRIVERS q_u;
 	SPOOL_R_ENUMPRINTERDRIVERS r_u;
@@ -663,7 +662,7 @@ static BOOL api_spoolss_enumprinterdrivers(uint16 vuid, prs_struct *data, prs_st
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_enumforms(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumforms(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMFORMS q_u;
 	SPOOL_R_ENUMFORMS r_u;
@@ -699,7 +698,7 @@ static BOOL api_spoolss_enumforms(uint16 vuid, prs_struct *data, prs_struct *rda
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_enumports(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumports(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMPORTS q_u;
 	SPOOL_R_ENUMPORTS r_u;
@@ -735,7 +734,7 @@ static BOOL api_spoolss_enumports(uint16 vuid, prs_struct *data, prs_struct *rda
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_addprinterex(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_addprinterex(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ADDPRINTEREX q_u;
 	SPOOL_R_ADDPRINTEREX r_u;
@@ -775,7 +774,7 @@ static BOOL api_spoolss_addprinterex(uint16 vuid, prs_struct *data, prs_struct *
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_addprinterdriver(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_addprinterdriver(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ADDPRINTERDRIVER q_u;
 	SPOOL_R_ADDPRINTERDRIVER r_u;
@@ -800,7 +799,7 @@ static BOOL api_spoolss_addprinterdriver(uint16 vuid, prs_struct *data, prs_stru
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_getprinterdriverdirectory(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_getprinterdriverdirectory(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_GETPRINTERDRIVERDIR q_u;
 	SPOOL_R_GETPRINTERDRIVERDIR r_u;
@@ -835,7 +834,7 @@ static BOOL api_spoolss_getprinterdriverdirectory(uint16 vuid, prs_struct *data,
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_enumprinterdata(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumprinterdata(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMPRINTERDATA q_u;
 	SPOOL_R_ENUMPRINTERDATA r_u;
@@ -868,7 +867,7 @@ static BOOL api_spoolss_enumprinterdata(uint16 vuid, prs_struct *data, prs_struc
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_setprinterdata(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_setprinterdata(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_SETPRINTERDATA q_u;
 	SPOOL_R_SETPRINTERDATA r_u;	
@@ -895,7 +894,7 @@ static BOOL api_spoolss_setprinterdata(uint16 vuid, prs_struct *data, prs_struct
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_addform(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_addform(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ADDFORM q_u;
 	SPOOL_R_ADDFORM r_u;
@@ -920,7 +919,7 @@ static BOOL api_spoolss_addform(uint16 vuid, prs_struct *data, prs_struct *rdata
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_setform(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_setform(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_SETFORM q_u;
 	SPOOL_R_SETFORM r_u;
@@ -945,7 +944,7 @@ static BOOL api_spoolss_setform(uint16 vuid, prs_struct *data, prs_struct *rdata
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_enumprintprocessors(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumprintprocessors(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMPRINTPROCESSORS q_u;
 	SPOOL_R_ENUMPRINTPROCESSORS r_u;
@@ -980,7 +979,7 @@ static BOOL api_spoolss_enumprintprocessors(uint16 vuid, prs_struct *data, prs_s
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_enumprintprocdatatypes(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumprintprocdatatypes(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMPRINTPROCDATATYPES q_u;
 	SPOOL_R_ENUMPRINTPROCDATATYPES r_u;
@@ -1015,7 +1014,7 @@ static BOOL api_spoolss_enumprintprocdatatypes(uint16 vuid, prs_struct *data, pr
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_enumprintmonitors(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_enumprintmonitors(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_ENUMPRINTMONITORS q_u;
 	SPOOL_R_ENUMPRINTMONITORS r_u;
@@ -1050,7 +1049,7 @@ static BOOL api_spoolss_enumprintmonitors(uint16 vuid, prs_struct *data, prs_str
 
 /****************************************************************************
 ****************************************************************************/
-static BOOL api_spoolss_getjob(uint16 vuid, prs_struct *data, prs_struct *rdata)
+static BOOL api_spoolss_getjob(prs_struct *data, prs_struct *rdata)
 {
 	SPOOL_Q_GETJOB q_u;
 	SPOOL_R_GETJOB r_u;
@@ -1127,4 +1126,3 @@ BOOL api_spoolss_rpc(pipes_struct *p, prs_struct *data)
 {
 	return api_rpcTNP(p, "api_spoolss_rpc", api_spoolss_cmds, data);
 }
-
diff --git a/source3/rpc_server/srv_srvsvc.c b/source3/rpc_server/srv_srvsvc.c
index f42b94832b..c5307b264e 100644
--- a/source3/rpc_server/srv_srvsvc.c
+++ b/source3/rpc_server/srv_srvsvc.c
@@ -1,4 +1,3 @@
-
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
@@ -22,7 +21,6 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
 #include "nterr.h"
 
@@ -911,7 +909,7 @@ static void srv_reply_net_srv_get_info(SRV_Q_NET_SRV_GET_INFO *q_n,
 
 /*******************************************************************
 ********************************************************************/
-static BOOL api_srv_net_srv_get_info( uint16 vuid, prs_struct *data,
+static BOOL api_srv_net_srv_get_info(prs_struct *data,
                                     prs_struct *rdata )
 {
 	SRV_Q_NET_SRV_GET_INFO q_n;
@@ -928,7 +926,7 @@ static BOOL api_srv_net_srv_get_info( uint16 vuid, prs_struct *data,
 
 /*******************************************************************
 ********************************************************************/
-static BOOL api_srv_net_file_enum( uint16 vuid, prs_struct *data,
+static BOOL api_srv_net_file_enum(prs_struct *data,
                                     prs_struct *rdata )
 {
 	SRV_Q_NET_FILE_ENUM q_n;
@@ -948,7 +946,7 @@ static BOOL api_srv_net_file_enum( uint16 vuid, prs_struct *data,
 
 /*******************************************************************
 ********************************************************************/
-static BOOL api_srv_net_conn_enum( uint16 vuid, prs_struct *data,
+static BOOL api_srv_net_conn_enum(prs_struct *data,
                                     prs_struct *rdata )
 {
 	SRV_Q_NET_CONN_ENUM q_n;
@@ -968,7 +966,7 @@ static BOOL api_srv_net_conn_enum( uint16 vuid, prs_struct *data,
 
 /*******************************************************************
 ********************************************************************/
-static BOOL api_srv_net_sess_enum( uint16 vuid, prs_struct *data,
+static BOOL api_srv_net_sess_enum(prs_struct *data,
                                     prs_struct *rdata )
 {
 	SRV_Q_NET_SESS_ENUM q_n;
@@ -990,7 +988,7 @@ static BOOL api_srv_net_sess_enum( uint16 vuid, prs_struct *data,
  RPC to enumerate shares.
 ********************************************************************/
 
-static BOOL api_srv_net_share_enum( uint16 vuid, prs_struct *data,
+static BOOL api_srv_net_share_enum(prs_struct *data,
                                     prs_struct *rdata )
 {
 	SRV_Q_NET_SHARE_ENUM q_n;
@@ -1014,7 +1012,7 @@ static BOOL api_srv_net_share_enum( uint16 vuid, prs_struct *data,
  RPC to return share information.
 ********************************************************************/
 
-static BOOL api_srv_net_share_get_info( uint16 vuid, prs_struct *data,
+static BOOL api_srv_net_share_get_info(prs_struct *data,
                                         prs_struct *rdata )
 {
 	SRV_Q_NET_SHARE_GET_INFO q_n;
@@ -1077,7 +1075,7 @@ static BOOL srv_reply_net_remote_tod(SRV_Q_NET_REMOTE_TOD *q_n,
 }
 /*******************************************************************
 ********************************************************************/
-static BOOL api_srv_net_remote_tod( uint16 vuid, prs_struct *data,
+static BOOL api_srv_net_remote_tod(prs_struct *data,
                                     prs_struct *rdata )
 {
 	SRV_Q_NET_REMOTE_TOD q_n;
diff --git a/source3/rpc_server/srv_wkssvc.c b/source3/rpc_server/srv_wkssvc.c
index 658cadc625..ee60d73011 100644
--- a/source3/rpc_server/srv_wkssvc.c
+++ b/source3/rpc_server/srv_wkssvc.c
@@ -1,4 +1,3 @@
-
 /* 
  *  Unix SMB/Netbios implementation.
  *  Version 1.9.
@@ -22,14 +21,11 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 extern pstring global_myname;
 
-
 /*******************************************************************
  create_wks_info_100
  ********************************************************************/
@@ -80,8 +76,7 @@ static void wks_reply_query_info(WKS_Q_QUERY_INFO *q_u,
 /*******************************************************************
  api_wks_query_info
  ********************************************************************/
-static BOOL api_wks_query_info( uint16 vuid, prs_struct *data,
-                                    prs_struct *rdata )
+static BOOL api_wks_query_info(prs_struct *data, prs_struct *rdata)
 {
 	WKS_Q_QUERY_INFO q_u;
 
@@ -111,4 +106,3 @@ BOOL api_wkssvc_rpc(pipes_struct *p, prs_struct *data)
 {
 	return api_rpcTNP(p, "api_wkssvc_rpc", api_wks_cmds, data);
 }
-