r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need
[vlendec/samba-autobuild/.git] / source3 / rpc_server / srv_srvsvc_nt.c
index e9dd015421ca974c1e44fff566be8f65c4b6d75e..12a86ce9f3322675ed31c5debb1ebd2a0409c1be 100644 (file)
@@ -2,8 +2,9 @@
  *  Unix SMB/CIFS implementation.
  *  RPC Pipe client / server routines
  *  Copyright (C) Andrew Tridgell              1992-1997,
- *  Copyright (C) Jeremy Allison                                       2001.
- *  Copyright (C) Nigel Williams                                       2001.
+ *  Copyright (C) Jeremy Allison               2001.
+ *  Copyright (C) Nigel Williams               2001.
+ *  Copyright (C) Gerald (Jerry) Carter        2006.
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
 #include "includes.h"
 
 extern struct generic_mapping file_generic_mapping;
+extern userdom_struct current_user_info;
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
 
+/* Use for enumerating connections, pipes, & files */
+
+struct file_enum_count {
+       TALLOC_CTX *ctx;
+       int count;
+       FILE_INFO_3 *info;
+};
+
+struct sess_file_count {
+       pid_t pid;
+       uid_t uid;
+       int count;
+};
+
+/****************************************************************************
+ Count the entries belonging to a service in the connection db.
+****************************************************************************/
+
+static int pipe_enum_fn( TDB_CONTEXT *the_tdb, TDB_DATA kbuf, TDB_DATA dbuf, void *p)
+{
+       struct pipe_open_rec prec;
+       struct file_enum_count *fenum = (struct file_enum_count *)p;
+       if (dbuf.dsize != sizeof(struct pipe_open_rec))
+               return 0;
+
+       memcpy(&prec, dbuf.dptr, sizeof(struct pipe_open_rec));
+       if ( process_exists(prec.pid) ) {
+               FILE_INFO_3 *f;
+               int i = fenum->count;
+               pstring fullpath;
+               
+               snprintf( fullpath, sizeof(fullpath), "\\PIPE\\%s", prec.name );
+               
+               f = TALLOC_REALLOC_ARRAY( fenum->ctx, fenum->info, FILE_INFO_3, i+1 );
+               if ( !f ) {
+                       DEBUG(0,("conn_enum_fn: realloc failed for %d items\n", i+1));
+                       return 1;
+               }
+               fenum->info = f;
+               
+               
+               init_srv_file_info3( &fenum->info[i], 
+                       (uint32)((procid_to_pid(&prec.pid)<<16) & prec.pnum),
+                       (FILE_READ_DATA|FILE_WRITE_DATA), 
+                       0,
+                       uidtoname( prec.uid ),
+                       fullpath );
+                       
+               fenum->count++;
+       }
+
+       return 0;
+}
+
+/*******************************************************************
+********************************************************************/
+
+static WERROR net_enum_pipes( TALLOC_CTX *ctx, FILE_INFO_3 **info, 
+                              uint32 *count, uint32 resume )
+{
+       struct file_enum_count fenum;
+       TDB_CONTEXT *conn_tdb = conn_tdb_ctx();
+
+       if ( !conn_tdb ) {
+               DEBUG(0,("net_enum_pipes: Failed to retrieve the connections tdb handle!\n"));
+               return WERR_ACCESS_DENIED;
+       }
+       
+       fenum.ctx = ctx;
+       fenum.count = *count;
+       fenum.info = *info;
+
+       if (tdb_traverse(conn_tdb, pipe_enum_fn, &fenum) == -1) {
+               DEBUG(0,("net_enum_pipes: traverse of connections.tdb failed with error %s.\n",
+                       tdb_errorstr(conn_tdb) ));
+               return WERR_NOMEM;
+       }
+       
+       *info  = fenum.info;
+       *count = fenum.count;
+       
+       return WERR_OK;}
+
+/*******************************************************************
+********************************************************************/
+
+/* global needed to make use of the share_mode_forall() callback */
+static struct file_enum_count f_enum_cnt;
+
+static void enum_file_fn( const struct share_mode_entry *e, 
+                          const char *sharepath, const char *fname )
+{
+       struct file_enum_count *fenum = &f_enum_cnt;
+       /* If the pid was not found delete the entry from connections.tdb */
+
+       if ( process_exists(e->pid) ) {
+               FILE_INFO_3 *f;
+               int i = fenum->count;
+               files_struct fsp;
+               struct byte_range_lock *brl;
+               int num_locks = 0;
+               pstring fullpath;
+               uint32 permissions;
+               
+               f = TALLOC_REALLOC_ARRAY( fenum->ctx, fenum->info, FILE_INFO_3, i+1 );                  
+               if ( !f ) {
+                       DEBUG(0,("conn_enum_fn: realloc failed for %d items\n", i+1));
+                       return;
+               }
+               fenum->info = f;
+
+               /* need to count the number of locks on a file */
+               
+               ZERO_STRUCT( fsp );             
+               fsp.dev   = e->dev;
+               fsp.inode = e->inode;
+               
+               if ( (brl = brl_get_locks(NULL,&fsp)) != NULL ) {
+                       num_locks = brl->num_locks;
+                       TALLOC_FREE( brl );
+               }
+               
+               if ( strcmp( fname, "." ) == 0 ) {
+                       pstr_sprintf( fullpath, "C:%s", sharepath );
+               } else {
+                       pstr_sprintf( fullpath, "C:%s/%s", sharepath, fname );
+               }
+               string_replace( fullpath, '/', '\\' );
+               
+               /* mask out create (what ever that is) */
+               permissions = e->share_access & (FILE_READ_DATA|FILE_WRITE_DATA);
+
+               /* now fill in the FILE_INFO_3 struct */
+               init_srv_file_info3( &fenum->info[i], 
+                       e->share_file_id,
+                       permissions,
+                       num_locks,
+                       uidtoname(e->uid),
+                       fullpath );
+                       
+               fenum->count++;
+       }
+
+       return;
+
+}
+
+/*******************************************************************
+********************************************************************/
+
+static WERROR net_enum_files( TALLOC_CTX *ctx, FILE_INFO_3 **info, 
+                              uint32 *count, uint32 resume )
+{
+       f_enum_cnt.ctx = ctx;
+       f_enum_cnt.count = *count;
+       f_enum_cnt.info = *info;
+       
+       share_mode_forall( enum_file_fn );
+       
+       *info  = f_enum_cnt.info;
+       *count = f_enum_cnt.count;
+       
+       return WERR_OK;
+}
+
 /*******************************************************************
  Utility function to get the 'type' of a share from an snum.
  ********************************************************************/
@@ -70,11 +240,16 @@ static void init_srv_share_info_0(pipes_struct *p, SRV_SHARE_INFO_0 *sh0, int sn
 
 static void init_srv_share_info_1(pipes_struct *p, SRV_SHARE_INFO_1 *sh1, int snum)
 {
+       connection_struct *conn = p->conn;
        pstring remark;
 
        char *net_name = lp_servicename(snum);
        pstrcpy(remark, lp_comment(snum));
-       standard_sub_conn(p->conn, remark,sizeof(remark));
+       standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
+                             conn->connectpath, conn->gid,
+                             get_current_username(),
+                             current_user_info.domain,
+                             remark, sizeof(remark));
 
        init_srv_share_info1(&sh1->info_1, net_name, get_share_type(snum), remark);
        init_srv_share_info1_str(&sh1->info_1_str, net_name, remark);
@@ -86,13 +261,21 @@ static void init_srv_share_info_1(pipes_struct *p, SRV_SHARE_INFO_1 *sh1, int sn
 
 static void init_srv_share_info_2(pipes_struct *p, SRV_SHARE_INFO_2 *sh2, int snum)
 {
+       connection_struct *conn = p->conn;
        pstring remark;
        pstring path;
        pstring passwd;
-
+       int max_connections = lp_max_connections(snum);
+       uint32 max_uses = max_connections!=0 ? max_connections : 0xffffffff;
+       int count = 0;
        char *net_name = lp_servicename(snum);
+       
        pstrcpy(remark, lp_comment(snum));
-       standard_sub_conn(p->conn, remark,sizeof(remark));
+       standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
+                             conn->connectpath, conn->gid,
+                             get_current_username(),
+                             current_user_info.domain,
+                             remark, sizeof(remark));
        pstrcpy(path, "C:");
        pstrcat(path, lp_pathname(snum));
 
@@ -105,193 +288,18 @@ static void init_srv_share_info_2(pipes_struct *p, SRV_SHARE_INFO_2 *sh2, int sn
 
        pstrcpy(passwd, "");
 
-       init_srv_share_info2(&sh2->info_2, net_name, get_share_type(snum), remark, 0, 0xffffffff, 1, path, passwd);
-       init_srv_share_info2_str(&sh2->info_2_str, net_name, remark, path, passwd);
-}
+       count = count_current_connections( net_name, False  );
+       init_srv_share_info2(&sh2->info_2, net_name, get_share_type(snum), 
+               remark, 0, max_uses, count, path, passwd);
 
-/*******************************************************************
- What to do when smb.conf is updated.
- ********************************************************************/
-
-static void smb_conf_updated(int msg_type, pid_t src, void *buf, size_t len)
-{
-       DEBUG(10,("smb_conf_updated: Got message saying smb.conf was updated. Reloading.\n"));
-       reload_services(False);
-}
-
-/*******************************************************************
- Create the share security tdb.
- ********************************************************************/
-
-static TDB_CONTEXT *share_tdb; /* used for share security descriptors */
-#define SHARE_DATABASE_VERSION_V1 1
-#define SHARE_DATABASE_VERSION_V2 2 /* version id in little endian. */
-
-BOOL share_info_db_init(void)
-{
-       static pid_t local_pid;
-       const char *vstring = "INFO/version";
-       int32 vers_id;
-       if (share_tdb && local_pid == sys_getpid())
-               return True;
-       share_tdb = tdb_open_log(lock_path("share_info.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-       if (!share_tdb) {
-               DEBUG(0,("Failed to open share info database %s (%s)\n",
-                       lock_path("share_info.tdb"), strerror(errno) ));
-               return False;
-       }
-       local_pid = sys_getpid();
-       /* handle a Samba upgrade */
-       tdb_lock_bystring(share_tdb, vstring, 0);
-
-       /* Cope with byte-reversed older versions of the db. */
-       vers_id = tdb_fetch_int32(share_tdb, vstring);
-       if ((vers_id == SHARE_DATABASE_VERSION_V1) || (IREV(vers_id) == SHARE_DATABASE_VERSION_V1)) {
-               /* Written on a bigendian machine with old fetch_int code. Save as le. */
-               tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2);
-               vers_id = SHARE_DATABASE_VERSION_V2;
-       }
-
-       if (vers_id != SHARE_DATABASE_VERSION_V2) {
-               tdb_traverse(share_tdb, tdb_traverse_delete_fn, NULL);
-               tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2);
-       }
-       tdb_unlock_bystring(share_tdb, vstring);
-
-       message_register(MSG_SMB_CONF_UPDATED, smb_conf_updated);
-       return True;
-}
-
-/*******************************************************************
- Fake up a Everyone, full access as a default.
- ********************************************************************/
-
-static SEC_DESC *get_share_security_default( TALLOC_CTX *ctx, int snum, size_t *psize)
-{
-       SEC_ACCESS sa;
-       SEC_ACE ace;
-       SEC_ACL *psa = NULL;
-       SEC_DESC *psd = NULL;
-       uint32 def_access = GENERIC_ALL_ACCESS;
-
-       se_map_generic(&def_access, &file_generic_mapping);
-
-       init_sec_access(&sa, GENERIC_ALL_ACCESS | def_access );
-       init_sec_ace(&ace, &global_sid_World, SEC_ACE_TYPE_ACCESS_ALLOWED, sa, 0);
-
-       if ((psa = make_sec_acl(ctx, NT4_ACL_REVISION, 1, &ace)) != NULL) {
-               psd = make_sec_desc(ctx, SEC_DESC_REVISION, SEC_DESC_SELF_RELATIVE, NULL, NULL, NULL, psa, psize);
-       }
-
-       if (!psd) {
-               DEBUG(0,("get_share_security: Failed to make SEC_DESC.\n"));
-               return NULL;
-       }
-
-       return psd;
-}
-
-/*******************************************************************
- Pull a security descriptor from the share tdb.
- ********************************************************************/
-
-static SEC_DESC *get_share_security( TALLOC_CTX *ctx, int snum, size_t *psize)
-{
-       prs_struct ps;
-       fstring key;
-       SEC_DESC *psd = NULL;
-
-       *psize = 0;
-
-       /* Fetch security descriptor from tdb */
-       slprintf(key, sizeof(key)-1, "SECDESC/%s", lp_servicename(snum));
-       if (tdb_prs_fetch(share_tdb, key, &ps, ctx)!=0 ||
-               !sec_io_desc("get_share_security", &psd, &ps, 1)) {
-               DEBUG(4,("get_share_security: using default secdesc for %s\n", lp_servicename(snum) ));
-               return get_share_security_default(ctx, snum, psize);
-       }
-
-       if (psd)
-               *psize = sec_desc_size(psd);
-
-       prs_mem_free(&ps);
-       return psd;
-}
-
-/*******************************************************************
- Store a security descriptor in the share db.
- ********************************************************************/
-
-static BOOL set_share_security(TALLOC_CTX *ctx, const char *share_name, SEC_DESC *psd)
-{
-       prs_struct ps;
-       TALLOC_CTX *mem_ctx = NULL;
-       fstring key;
-       BOOL ret = False;
-
-       mem_ctx = talloc_init("set_share_security");
-       if (mem_ctx == NULL)
-               return False;
-
-       prs_init(&ps, (uint32)sec_desc_size(psd), mem_ctx, MARSHALL);
-       if (!sec_io_desc("share_security", &psd, &ps, 1))
-               goto out;
-       slprintf(key, sizeof(key)-1, "SECDESC/%s", share_name);
-       if (tdb_prs_store(share_tdb, key, &ps)==0) {
-               ret = True;
-               DEBUG(5,("set_share_security: stored secdesc for %s\n", share_name ));
-       } else {
-               DEBUG(1,("set_share_security: Failed to store secdesc for %s\n", share_name ));
-       } 
-
-       /* Free malloc'ed memory */
-out:
-       prs_mem_free(&ps);
-       if (mem_ctx)
-               talloc_destroy(mem_ctx);
-       return ret;
-}
-
-/*******************************************************************
- Delete a security descriptor.
-********************************************************************/
-
-static BOOL delete_share_security(int snum)
-{
-       TDB_DATA kbuf;
-       fstring key;
-
-       slprintf(key, sizeof(key)-1, "SECDESC/%s", lp_servicename(snum));
-       kbuf.dptr = key;
-       kbuf.dsize = strlen(key)+1;
-
-       if (tdb_delete(share_tdb, kbuf) != 0) {
-               DEBUG(0,("delete_share_security: Failed to delete entry for share %s\n",
-                               lp_servicename(snum) ));
-               return False;
-       }
-
-       return True;
+       init_srv_share_info2_str(&sh2->info_2_str, net_name, remark, path, passwd);
 }
 
 /*******************************************************************
  Map any generic bits to file specific bits.
 ********************************************************************/
 
-void map_generic_share_sd_bits(SEC_DESC *psd)
+static void map_generic_share_sd_bits(SEC_DESC *psd)
 {
        int i;
        SEC_ACL *ps_dacl = NULL;
@@ -355,11 +363,16 @@ out:
 
 static void init_srv_share_info_501(pipes_struct *p, SRV_SHARE_INFO_501 *sh501, int snum)
 {
+       connection_struct *conn = p->conn;
        pstring remark;
 
        const char *net_name = lp_servicename(snum);
        pstrcpy(remark, lp_comment(snum));
-       standard_sub_conn(p->conn, remark, sizeof(remark));
+       standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
+                             conn->connectpath, conn->gid,
+                             get_current_username(),
+                             current_user_info.domain,
+                             remark, sizeof(remark));
 
        init_srv_share_info501(&sh501->info_501, net_name, get_share_type(snum), remark, (lp_csc_policy(snum) << 4));
        init_srv_share_info501_str(&sh501->info_501_str, net_name, remark);
@@ -371,6 +384,7 @@ static void init_srv_share_info_501(pipes_struct *p, SRV_SHARE_INFO_501 *sh501,
 
 static void init_srv_share_info_502(pipes_struct *p, SRV_SHARE_INFO_502 *sh502, int snum)
 {
+       connection_struct *conn = p->conn;
        pstring net_name;
        pstring remark;
        pstring path;
@@ -384,7 +398,11 @@ static void init_srv_share_info_502(pipes_struct *p, SRV_SHARE_INFO_502 *sh502,
 
        pstrcpy(net_name, lp_servicename(snum));
        pstrcpy(remark, lp_comment(snum));
-       standard_sub_conn(p->conn, remark,sizeof(remark));
+       standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
+                             conn->connectpath, conn->gid,
+                             get_current_username(),
+                             current_user_info.domain,
+                             remark, sizeof(remark));
        pstrcpy(path, "C:");
        pstrcat(path, lp_pathname(snum));
 
@@ -409,10 +427,15 @@ static void init_srv_share_info_502(pipes_struct *p, SRV_SHARE_INFO_502 *sh502,
 
 static void init_srv_share_info_1004(pipes_struct *p, SRV_SHARE_INFO_1004* sh1004, int snum)
 {
+       connection_struct *conn = p->conn;
         pstring remark;
 
        pstrcpy(remark, lp_comment(snum));
-       standard_sub_conn(p->conn, remark, sizeof(remark));
+       standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
+                             conn->connectpath, conn->gid,
+                             get_current_username(),
+                             current_user_info.domain,
+                             remark, sizeof(remark));
 
        ZERO_STRUCTP(sh1004);
   
@@ -494,7 +517,7 @@ static BOOL init_srv_share_info_ctr(pipes_struct *p, SRV_SHARE_INFO_CTR *ctr,
               uint32 info_level, uint32 *resume_hnd, uint32 *total_entries, BOOL all_shares)
 {
        int num_entries = 0;
-       int num_services = lp_numservices();
+       int num_services = 0;
        int snum;
        TALLOC_CTX *ctx = p->mem_ctx;
 
@@ -505,6 +528,11 @@ static BOOL init_srv_share_info_ctr(pipes_struct *p, SRV_SHARE_INFO_CTR *ctr,
        ctr->info_level = ctr->switch_value = info_level;
        *resume_hnd = 0;
 
+       /* Ensure all the usershares are loaded. */
+       become_root();
+       num_services = load_usershare_shares();
+       unbecome_root();
+
        /* Count the number of entries. */
        for (snum = 0; snum < num_services; snum++) {
                if (lp_browseable(snum) && lp_snum_ok(snum) && (all_shares || !is_hidden_share(snum)) )
@@ -803,16 +831,6 @@ static void init_srv_r_net_share_get_info(pipes_struct *p, SRV_R_NET_SHARE_GET_I
        r_n->status = status;
 }
 
-/*******************************************************************
- fill in a sess info level 1 structure.
- ********************************************************************/
-
-static void init_srv_sess_0_info(SESS_INFO_0 *se0, SESS_INFO_0_STR *str0, char *name)
-{
-       init_srv_sess_info0(se0, name);
-       init_srv_sess_info0_str(str0, name);
-}
-
 /*******************************************************************
  fill in a sess info level 0 structure.
  ********************************************************************/
@@ -833,11 +851,7 @@ static void init_srv_sess_info_0(SRV_SESS_INFO_0 *ss0, uint32 *snum, uint32 *sto
 
        if (snum) {
                for (; (*snum) < (*stot) && num_entries < MAX_SESS_ENTRIES; (*snum)++) {
-                       init_srv_sess_0_info(&ss0->info_0[num_entries],
-                                                                &ss0->info_0_str[num_entries], session_list[(*snum)].remote_machine);
-
-                       /* move on to creating next session */
-                       /* move on to creating next sess */
+                       init_srv_sess_info0( &ss0->info_0[num_entries], session_list[(*snum)].remote_machine);
                        num_entries++;
                }
 
@@ -858,17 +872,35 @@ static void init_srv_sess_info_0(SRV_SESS_INFO_0 *ss0, uint32 *snum, uint32 *sto
 }
 
 /*******************************************************************
- fill in a sess info level 1 structure.
- ********************************************************************/
+********************************************************************/
 
-static void init_srv_sess_1_info(SESS_INFO_1 *se1, SESS_INFO_1_STR *str1,
-                               char *name, char *user,
-                               uint32 num_opens,
-                               uint32 open_time, uint32 idle_time,
-                               uint32 usr_flgs)
+/* global needed to make use of the share_mode_forall() callback */
+static struct sess_file_count s_file_cnt;
+
+static void sess_file_fn( const struct share_mode_entry *e, 
+                          const char *sharepath, const char *fname )
 {
-       init_srv_sess_info1(se1 , name, user, num_opens, open_time, idle_time, usr_flgs);
-       init_srv_sess_info1_str(str1, name, user);
+       struct sess_file_count *sess = &s_file_cnt;
+       if ( (procid_to_pid(&e->pid) == sess->pid) && (sess->uid == e->uid) ) {
+               sess->count++;
+       }
+       
+       return;
+}
+
+/*******************************************************************
+********************************************************************/
+
+static int net_count_files( uid_t uid, pid_t pid )
+{
+       s_file_cnt.count = 0;
+       s_file_cnt.uid = uid;
+       s_file_cnt.pid = pid;
+       
+       share_mode_forall( sess_file_fn );
+       
+       return s_file_cnt.count;
 }
 
 /*******************************************************************
@@ -879,44 +911,61 @@ static void init_srv_sess_info_1(SRV_SESS_INFO_1 *ss1, uint32 *snum, uint32 *sto
 {
        struct sessionid *session_list;
        uint32 num_entries = 0;
-       (*stot) = list_sessions(&session_list);
+       time_t now = time(NULL);
 
+       if ( !snum ) {
+               ss1->num_entries_read = 0;
+               ss1->ptr_sess_info = 0;
+               ss1->num_entries_read2 = 0;
+               
+               (*stot) = 0;
+
+               return;
+       }
+       
        if (ss1 == NULL) {
                (*snum) = 0;
-               SAFE_FREE(session_list);
                return;
        }
 
-       DEBUG(5,("init_srv_sess_1_ss1\n"));
-
-       if (snum) {
-               for (; (*snum) < (*stot) && num_entries < MAX_SESS_ENTRIES; (*snum)++) {
-                       init_srv_sess_1_info(&ss1->info_1[num_entries],
-                                            &ss1->info_1_str[num_entries],
-                                           session_list[*snum].remote_machine,
-                                            session_list[*snum].username,
-                                            1, 10, 5, 0);
-
-                       /* move on to creating next session */
-                       /* move on to creating next sess */
-                       num_entries++;
-               }
+       (*stot) = list_sessions(&session_list);
+       
 
-               ss1->num_entries_read  = num_entries;
-               ss1->ptr_sess_info     = num_entries > 0 ? 1 : 0;
-               ss1->num_entries_read2 = num_entries;
-               
-               if ((*snum) >= (*stot)) {
-                       (*snum) = 0;
+       for (; (*snum) < (*stot) && num_entries < MAX_SESS_ENTRIES; (*snum)++) {
+               uint32 num_files;
+               uint32 connect_time;
+               struct passwd *pw = sys_getpwnam(session_list[*snum].username);
+               BOOL guest;
+                       
+               if ( !pw ) {
+                       DEBUG(10,("init_srv_sess_info_1: failed to find owner: %s\n",
+                               session_list[*snum].username));
+                       continue;
                }
-
-       } else {
-               ss1->num_entries_read = 0;
-               ss1->ptr_sess_info = 0;
-               ss1->num_entries_read2 = 0;
-               
-               (*stot) = 0;
+                               
+               connect_time = (uint32)(now - session_list[*snum].connect_start);
+               num_files = net_count_files(pw->pw_uid, session_list[*snum].pid);
+               guest = strequal( session_list[*snum].username, lp_guestaccount() );
+                                       
+               init_srv_sess_info1( &ss1->info_1[num_entries], 
+                                    session_list[*snum].remote_machine,
+                                    session_list[*snum].username, 
+                                    num_files,
+                                    connect_time,
+                                    0, 
+                                    guest);
+               num_entries++;
+       }
+
+       ss1->num_entries_read  = num_entries;
+       ss1->ptr_sess_info     = num_entries > 0 ? 1 : 0;
+       ss1->num_entries_read2 = num_entries;
+       
+       if ((*snum) >= (*stot)) {
+               (*snum) = 0;
        }
+
+       SAFE_FREE(session_list);
 }
 
 /*******************************************************************
@@ -1133,66 +1182,53 @@ static void init_srv_r_net_conn_enum(SRV_R_NET_CONN_ENUM *r_n,
  makes a SRV_R_NET_FILE_ENUM structure.
 ********************************************************************/
 
-static WERROR init_srv_file_info_ctr(pipes_struct *p, SRV_FILE_INFO_CTR *ctr,
-                                    int switch_value, uint32 *resume_hnd, 
-                                    uint32 *total_entries)  
+static WERROR net_file_enum_3( SRV_R_NET_FILE_ENUM *r, uint32 resume_hnd )
 {
-       WERROR status = WERR_OK;
-       TALLOC_CTX *ctx = p->mem_ctx;
-       DEBUG(5,("init_srv_file_info_ctr: %d\n", __LINE__));
-       *total_entries = 1; /* dummy entries only, for */
+       TALLOC_CTX *ctx = get_talloc_ctx();
+       SRV_FILE_INFO_CTR *ctr = &r->ctr;
 
-       ctr->switch_value = switch_value;
-       ctr->num_entries = *total_entries - *resume_hnd;
+       /* TODO -- Windows enumerates 
+          (b) active pipes
+          (c) open directories and files */
+
+       r->status = net_enum_files( ctx, &ctr->file.info3, &ctr->num_entries, resume_hnd );
+       if ( !W_ERROR_IS_OK(r->status))
+               goto done;
+               
+       r->status = net_enum_pipes( ctx, &ctr->file.info3, &ctr->num_entries, resume_hnd );
+       if ( !W_ERROR_IS_OK(r->status))
+               goto done;
+       
+       r->level = ctr->level = 3;
+       r->total_entries = ctr->num_entries;
+       /* ctr->num_entries = r->total_entries - resume_hnd; */
        ctr->num_entries2 = ctr->num_entries;
+       ctr->ptr_file_info = 1;
 
-       switch (switch_value) {
-       case 3: {
-               int i;
-               if (*total_entries > 0) {
-                       ctr->ptr_entries = 1;
-                       ctr->file.info3 = TALLOC_ARRAY(ctx, SRV_FILE_INFO_3, ctr->num_entries);
-               }
-               for (i=0 ;i<ctr->num_entries;i++) {
-                       init_srv_file_info3(&ctr->file.info3[i].info_3, i+*resume_hnd, 0x35, 0, "\\PIPE\\samr", "dummy user");
-                       init_srv_file_info3_str(&ctr->file.info3[i].info_3_str,  "\\PIPE\\samr", "dummy user");
-                       
-               }
-               ctr->ptr_file_info = 1;
-               *resume_hnd = 0;
-               break;
-       }
-       default:
-               DEBUG(5,("init_srv_file_info_ctr: unsupported switch value %d\n", switch_value));
-               (*resume_hnd = 0);
-               (*total_entries) = 0;
-               ctr->ptr_entries = 0;
-               status = WERR_UNKNOWN_LEVEL;
-               break;
-       }
+       r->status = WERR_OK;
 
-       return status;
+done:
+       if ( ctr->num_entries > 0 ) 
+               ctr->ptr_entries = 1;
+
+       init_enum_hnd(&r->enum_hnd, 0);
+
+       return r->status;
 }
 
 /*******************************************************************
- makes a SRV_R_NET_FILE_ENUM structure.
-********************************************************************/
+*******************************************************************/
 
-static void init_srv_r_net_file_enum(pipes_struct *p, SRV_R_NET_FILE_ENUM *r_n,
-                               uint32 resume_hnd, int file_level, int switch_value)  
+WERROR _srv_net_file_enum(pipes_struct *p, SRV_Q_NET_FILE_ENUM *q_u, SRV_R_NET_FILE_ENUM *r_u)
 {
-       DEBUG(5,("init_srv_r_net_file_enum: %d\n", __LINE__));
-
-       r_n->file_level  = file_level;
-       if (file_level == 0)
-               r_n->status = WERR_UNKNOWN_LEVEL;
-       else
-               r_n->status = init_srv_file_info_ctr(p, &r_n->ctr, switch_value, &resume_hnd, &(r_n->total_entries));
-
-       if (!W_ERROR_IS_OK(r_n->status))
-               resume_hnd = 0;
-
-       init_enum_hnd(&r_n->enum_hnd, resume_hnd);
+       switch ( q_u->level ) {
+       case 3:
+               return net_file_enum_3( r_u, get_enum_hnd(&q_u->enum_hnd) );    
+       default:
+               return WERR_UNKNOWN_LEVEL;
+       }
+       
+       return WERR_OK;
 }
 
 /*******************************************************************
@@ -1278,25 +1314,6 @@ WERROR _srv_net_srv_set_info(pipes_struct *p, SRV_Q_NET_SRV_SET_INFO *q_u, SRV_R
        return r_u->status;
 }
 
-/*******************************************************************
-net file enum
-********************************************************************/
-
-WERROR _srv_net_file_enum(pipes_struct *p, SRV_Q_NET_FILE_ENUM *q_u, SRV_R_NET_FILE_ENUM *r_u)
-{
-       DEBUG(5,("srv_net_file_enum: %d\n", __LINE__));
-
-       /* set up the */
-       init_srv_r_net_file_enum(p, r_u,
-                               get_enum_hnd(&q_u->enum_hnd),
-                               q_u->file_level,
-                               q_u->ctr.switch_value);
-
-       DEBUG(5,("srv_net_file_enum: %d\n", __LINE__));
-
-       return r_u->status;
-}
-
 /*******************************************************************
 net conn enum
 ********************************************************************/
@@ -1354,7 +1371,6 @@ net sess del
 WERROR _srv_net_sess_del(pipes_struct *p, SRV_Q_NET_SESS_DEL *q_u, SRV_R_NET_SESS_DEL *r_u)
 {
        struct sessionid *session_list;
-       struct current_user user;
        int num_sessions, snum;
        fstring username;
        fstring machine;
@@ -1374,11 +1390,9 @@ WERROR _srv_net_sess_del(pipes_struct *p, SRV_Q_NET_SESS_DEL *q_u, SRV_R_NET_SES
 
        r_u->status = WERR_ACCESS_DENIED;
 
-       get_current_user(&user, p);
-
        /* fail out now if you are not root or not a domain admin */
 
-       if ((user.uid != sec_initial_uid()) && 
+       if ((p->pipe_user.ut.uid != sec_initial_uid()) && 
                ( ! nt_token_check_domain_rid(p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS))) {
 
                goto done;
@@ -1389,12 +1403,12 @@ WERROR _srv_net_sess_del(pipes_struct *p, SRV_Q_NET_SESS_DEL *q_u, SRV_R_NET_SES
                if ((strequal(session_list[snum].username, username) || username[0] == '\0' ) &&
                    strequal(session_list[snum].remote_machine, machine)) {
                
-                       if (user.uid != sec_initial_uid()) {
+                       if (p->pipe_user.ut.uid != sec_initial_uid()) {
                                not_root = True;
                                become_root();
                        }
 
-                       if (message_send_pid(session_list[snum].pid, MSG_SHUTDOWN, NULL, 0, False))
+                       if (message_send_pid(pid_to_procid(session_list[snum].pid), MSG_SHUTDOWN, NULL, 0, False))
                                r_u->status = WERR_OK;
 
                        if (not_root) 
@@ -1506,7 +1520,6 @@ char *valid_share_pathname(char *dos_pathname)
 
 WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, SRV_R_NET_SHARE_SET_INFO *r_u)
 {
-       struct current_user user;
        pstring command;
        fstring share_name;
        fstring comment;
@@ -1518,6 +1531,7 @@ WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, S
        SEC_DESC *psd = NULL;
        SE_PRIV se_diskop = SE_DISK_OPERATOR;
        BOOL is_disk_op = False;
+       int max_connections = 0;
 
        DEBUG(5,("_srv_net_share_set_info: %d\n", __LINE__));
 
@@ -1542,13 +1556,11 @@ WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, S
        if (lp_print_ok(snum))
                return WERR_ACCESS_DENIED;
 
-       get_current_user(&user,p);
-
        is_disk_op = user_has_privileges( p->pipe_user.nt_user_token, &se_diskop );
        
        /* fail out now if you are not root and not a disk op */
        
-       if ( user.uid != sec_initial_uid() && !is_disk_op )
+       if ( p->pipe_user.ut.uid != sec_initial_uid() && !is_disk_op )
                return WERR_ACCESS_DENIED;
 
        switch (q_u->info_level) {
@@ -1562,6 +1574,7 @@ WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, S
                unistr2_to_ascii(comment, &q_u->info.share.info2.info_2_str.uni_remark, sizeof(comment));
                unistr2_to_ascii(pathname, &q_u->info.share.info2.info_2_str.uni_path, sizeof(pathname));
                type = q_u->info.share.info2.info_2.type;
+               max_connections = (q_u->info.share.info2.info_2.max_uses == 0xffffffff) ? 0 : q_u->info.share.info2.info_2.max_uses;
                psd = NULL;
                break;
 #if 0
@@ -1630,15 +1643,16 @@ WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, S
 
        /* Only call modify function if something changed. */
        
-       if (strcmp(path, lp_pathname(snum)) || strcmp(comment, lp_comment(snum)) ) 
+       if (strcmp(path, lp_pathname(snum)) || strcmp(comment, lp_comment(snum)) 
+               || (lp_max_connections(snum) != max_connections) ) 
        {
                if (!lp_change_share_cmd() || !*lp_change_share_cmd()) {
                        DEBUG(10,("_srv_net_share_set_info: No change share command\n"));
                        return WERR_ACCESS_DENIED;
                }
 
-               slprintf(command, sizeof(command)-1, "%s \"%s\" \"%s\" \"%s\" \"%s\"",
-                               lp_change_share_cmd(), dyn_CONFIGFILE, share_name, path, comment);
+               slprintf(command, sizeof(command)-1, "%s \"%s\" \"%s\" \"%s\" \"%s\" %d",
+                               lp_change_share_cmd(), dyn_CONFIGFILE, share_name, path, comment, max_connections ); 
 
                DEBUG(10,("_srv_net_share_set_info: Running [%s]\n", command ));
                                
@@ -1685,12 +1699,12 @@ WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, S
 }
 
 /*******************************************************************
- Net share add. Call 'add_share_command "sharename" "pathname" "comment" "read only = xxx"'
+ Net share add. Call 'add_share_command "sharename" "pathname" 
+ "comment" "max connections = "
 ********************************************************************/
 
 WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_SHARE_ADD *r_u)
 {
-       struct current_user user;
        pstring command;
        fstring share_name;
        fstring comment;
@@ -1702,16 +1716,15 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
        SEC_DESC *psd = NULL;
        SE_PRIV se_diskop = SE_DISK_OPERATOR;
        BOOL is_disk_op;
+       int max_connections = 0;
 
        DEBUG(5,("_srv_net_share_add: %d\n", __LINE__));
 
        r_u->parm_error = 0;
 
-       get_current_user(&user,p);
-
        is_disk_op = user_has_privileges( p->pipe_user.nt_user_token, &se_diskop );
 
-       if (user.uid != sec_initial_uid()  && !is_disk_op ) 
+       if (p->pipe_user.ut.uid != sec_initial_uid()  && !is_disk_op ) 
                return WERR_ACCESS_DENIED;
 
        if (!lp_add_share_cmd() || !*lp_add_share_cmd()) {
@@ -1730,6 +1743,7 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
                unistr2_to_ascii(share_name, &q_u->info.share.info2.info_2_str.uni_netname, sizeof(share_name));
                unistr2_to_ascii(comment, &q_u->info.share.info2.info_2_str.uni_remark, sizeof(share_name));
                unistr2_to_ascii(pathname, &q_u->info.share.info2.info_2_str.uni_path, sizeof(share_name));
+               max_connections = (q_u->info.share.info2.info_2.max_uses == 0xffffffff) ? 0 : q_u->info.share.info2.info_2.max_uses;
                type = q_u->info.share.info2.info_2.type;
                break;
        case 501:
@@ -1759,9 +1773,15 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
                return WERR_UNKNOWN_LEVEL;
        }
 
-       if ( strequal(share_name,"IPC$") 
-               || ( lp_enable_asu_support() && strequal(share_name,"ADMIN$") )
-               || strequal(share_name,"global") )
+       /* check for invalid share names */
+
+       if ( !validate_net_name( share_name, INVALID_SHARENAME_CHARS, sizeof(share_name) ) ) {
+               DEBUG(5,("_srv_net_name_validate: Bad sharename \"%s\"\n", share_name));
+               return WERR_INVALID_NAME;
+       }
+
+       if ( strequal(share_name,"IPC$") || strequal(share_name,"global")
+               || ( lp_enable_asu_support() && strequal(share_name,"ADMIN$") ) )
        {
                return WERR_ACCESS_DENIED;
        }
@@ -1785,8 +1805,13 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
        string_replace(path, '"', ' ');
        string_replace(comment, '"', ' ');
 
-       slprintf(command, sizeof(command)-1, "%s \"%s\" \"%s\" \"%s\" \"%s\"",
-                       lp_add_share_cmd(), dyn_CONFIGFILE, share_name, path, comment);
+       slprintf(command, sizeof(command)-1, "%s \"%s\" \"%s\" \"%s\" \"%s\" %d",
+                       lp_add_share_cmd(), 
+                       dyn_CONFIGFILE, 
+                       share_name, 
+                       path, 
+                       comment, 
+                       max_connections);
                        
        DEBUG(10,("_srv_net_share_add: Running [%s]\n", command ));
        
@@ -1834,7 +1859,6 @@ WERROR _srv_net_share_add(pipes_struct *p, SRV_Q_NET_SHARE_ADD *q_u, SRV_R_NET_S
 
 WERROR _srv_net_share_del(pipes_struct *p, SRV_Q_NET_SHARE_DEL *q_u, SRV_R_NET_SHARE_DEL *r_u)
 {
-       struct current_user user;
        pstring command;
        fstring share_name;
        int ret;
@@ -1862,11 +1886,9 @@ WERROR _srv_net_share_del(pipes_struct *p, SRV_Q_NET_SHARE_DEL *q_u, SRV_R_NET_S
        if (lp_print_ok(snum))
                return WERR_ACCESS_DENIED;
 
-       get_current_user(&user,p);
-
        is_disk_op = user_has_privileges( p->pipe_user.nt_user_token, &se_diskop );
 
-       if (user.uid != sec_initial_uid()  && !is_disk_op ) 
+       if (p->pipe_user.ut.uid != sec_initial_uid()  && !is_disk_op ) 
                return WERR_ACCESS_DENIED;
 
        if (!lp_delete_share_cmd() || !*lp_delete_share_cmd()) {
@@ -1924,12 +1946,16 @@ WERROR _srv_net_remote_tod(pipes_struct *p, SRV_Q_NET_REMOTE_TOD *q_u, SRV_R_NET
        struct tm *t;
        time_t unixdate = time(NULL);
 
-       tod = TALLOC_P(p->mem_ctx, TIME_OF_DAY_INFO);
-       if (!tod)
+       /* We do this call first as if we do it *after* the gmtime call
+          it overwrites the pointed-to values. JRA */
+
+       uint32 zone = get_time_zone(unixdate)/60;
+
+       DEBUG(5,("_srv_net_remote_tod: %d\n", __LINE__));
+
+       if ( !(tod = TALLOC_ZERO_P(p->mem_ctx, TIME_OF_DAY_INFO)) )
                return WERR_NOMEM;
 
-       ZERO_STRUCTP(tod);
        r_u->tod = tod;
        r_u->ptr_srv_tod = 0x1;
        r_u->status = WERR_OK;
@@ -1946,7 +1972,7 @@ WERROR _srv_net_remote_tod(pipes_struct *p, SRV_Q_NET_REMOTE_TOD *q_u, SRV_R_NET
                              t->tm_min,
                              t->tm_sec,
                              0,
-                             TimeDiff(unixdate)/60,
+                             zone,
                              10000,
                              t->tm_mday,
                              t->tm_mon + 1,
@@ -1974,7 +2000,6 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
        SMB_STRUCT_STAT st;
        BOOL bad_path;
        NTSTATUS nt_status;
-       struct current_user user;
        connection_struct *conn = NULL;
        BOOL became_user = False; 
 
@@ -1987,10 +2012,8 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
        /* Null password is ok - we are already an authenticated user... */
        null_pw = data_blob(NULL, 0);
 
-       get_current_user(&user, p);
-
        become_root();
-       conn = make_connection(qualname, null_pw, "A:", user.vuid, &nt_status);
+       conn = make_connection(qualname, null_pw, "A:", p->pipe_user.vuid, &nt_status);
        unbecome_root();
 
        if (conn == NULL) {
@@ -2020,18 +2043,18 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
                goto error_exit;
        }
 
-       fsp = open_file_stat(conn, filename, &st);
-       if (!fsp) {
+       nt_status = open_file_stat(conn, filename, &st, &fsp);
+       if (!NT_STATUS_IS_OK(nt_status)) {
                /* Perhaps it is a directory */
-               if (errno == EISDIR)
-                       fsp = open_directory(conn, filename, &st,
+               if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_IS_A_DIRECTORY))
+                       nt_status = open_directory(conn, filename, &st,
                                        READ_CONTROL_ACCESS,
                                        FILE_SHARE_READ|FILE_SHARE_WRITE,
                                        FILE_OPEN,
                                        0,
-                                       NULL);
+                                       NULL, &fsp);
 
-               if (!fsp) {
+               if (!NT_STATUS_IS_OK(nt_status)) {
                        DEBUG(3,("_srv_net_file_query_secdesc: Unable to open file %s\n", filename));
                        r_u->status = WERR_ACCESS_DENIED;
                        goto error_exit;
@@ -2054,22 +2077,22 @@ WERROR _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC
 
        psd->dacl->revision = (uint16) NT4_ACL_REVISION;
 
-       close_file(fsp, True);
+       close_file(fsp, NORMAL_CLOSE);
        unbecome_user();
-       close_cnum(conn, user.vuid);
+       close_cnum(conn, p->pipe_user.vuid);
        return r_u->status;
 
 error_exit:
 
        if(fsp) {
-               close_file(fsp, True);
+               close_file(fsp, NORMAL_CLOSE);
        }
 
        if (became_user)
                unbecome_user();
 
        if (conn) 
-               close_cnum(conn, user.vuid);
+               close_cnum(conn, p->pipe_user.vuid);
 
        return r_u->status;
 }
@@ -2089,7 +2112,6 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
        SMB_STRUCT_STAT st;
        BOOL bad_path;
        NTSTATUS nt_status;
-       struct current_user user;
        connection_struct *conn = NULL;
        BOOL became_user = False;
 
@@ -2102,10 +2124,8 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
        /* Null password is ok - we are already an authenticated user... */
        null_pw = data_blob(NULL, 0);
 
-       get_current_user(&user, p);
-
        become_root();
-       conn = make_connection(qualname, null_pw, "A:", user.vuid, &nt_status);
+       conn = make_connection(qualname, null_pw, "A:", p->pipe_user.vuid, &nt_status);
        unbecome_root();
 
        if (conn == NULL) {
@@ -2136,19 +2156,19 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
        }
 
 
-       fsp = open_file_stat(conn, filename, &st);
+       nt_status = open_file_stat(conn, filename, &st, &fsp);
 
-       if (!fsp) {
+       if (!NT_STATUS_IS_OK(nt_status)) {
                /* Perhaps it is a directory */
-               if (errno == EISDIR)
-                       fsp = open_directory(conn, filename, &st,
+               if (NT_STATUS_EQUAL(nt_status, NT_STATUS_FILE_IS_A_DIRECTORY))
+                       nt_status = open_directory(conn, filename, &st,
                                                FILE_READ_ATTRIBUTES,
                                                FILE_SHARE_READ|FILE_SHARE_WRITE,
                                                FILE_OPEN,
                                                0,
-                                               NULL);
+                                               NULL, &fsp);
 
-               if (!fsp) {
+               if (!NT_STATUS_IS_OK(nt_status)) {
                        DEBUG(3,("_srv_net_file_set_secdesc: Unable to open file %s\n", filename));
                        r_u->status = WERR_ACCESS_DENIED;
                        goto error_exit;
@@ -2163,15 +2183,15 @@ WERROR _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
                goto error_exit;
        }
 
-       close_file(fsp, True);
+       close_file(fsp, NORMAL_CLOSE);
        unbecome_user();
-       close_cnum(conn, user.vuid);
+       close_cnum(conn, p->pipe_user.vuid);
        return r_u->status;
 
 error_exit:
 
        if(fsp) {
-               close_file(fsp, True);
+               close_file(fsp, NORMAL_CLOSE);
        }
 
        if (became_user) {
@@ -2179,7 +2199,7 @@ error_exit:
        }
 
        if (conn) {
-               close_cnum(conn, user.vuid);
+               close_cnum(conn, p->pipe_user.vuid);
        }
 
        return r_u->status;
@@ -2272,33 +2292,35 @@ WERROR _srv_net_disk_enum(pipes_struct *p, SRV_Q_NET_DISK_ENUM *q_u, SRV_R_NET_D
        return r_u->status;
 }
 
+/********************************************************************
+********************************************************************/
+
 WERROR _srv_net_name_validate(pipes_struct *p, SRV_Q_NET_NAME_VALIDATE *q_u, SRV_R_NET_NAME_VALIDATE *r_u)
 {
-       int snum;
-       fstring share_name;
-
-       r_u->status=WERR_OK;
-
-       switch(q_u->type) {
+       fstring sharename;
 
+       switch ( q_u->type ) {
        case 0x9:
-
-               /*check if share name is ok*/
-               /*also check if we already have a share with this name*/
-
-               unistr2_to_ascii(share_name, &q_u->uni_name, sizeof(share_name));
-               snum = find_service(share_name);
-
-               /* Share already exists. */
-               if (snum >= 0)
-                       r_u->status = WERR_ALREADY_EXISTS;
+               rpcstr_pull(sharename, q_u->sharename.buffer, sizeof(sharename), q_u->sharename.uni_str_len*2, 0);
+               if ( !validate_net_name( sharename, INVALID_SHARENAME_CHARS, sizeof(sharename) ) ) {
+                       DEBUG(5,("_srv_net_name_validate: Bad sharename \"%s\"\n", sharename));
+                       return WERR_INVALID_NAME;
+               }
                break;
 
        default:
-               /*unsupported type*/
-               r_u->status = WERR_UNKNOWN_LEVEL;
-               break;
+               return WERR_UNKNOWN_LEVEL;
        }
 
-       return r_u->status;
+       return WERR_OK;
 }
+
+
+/********************************************************************
+********************************************************************/
+
+WERROR _srv_net_file_close(pipes_struct *p, SRV_Q_NET_FILE_CLOSE *q_u, SRV_R_NET_FILE_CLOSE *r_u)
+{
+       return WERR_ACCESS_DENIED;
+}
+