r13082: revert an accidentally commited patch (still in progress)

(This used to be commit e43775fb3156bf29e4e412f01ad2d731aa866323)

diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c
index b0e8111f62acd37628e85f3472567f1125aec9b5..230f0626628e4e45fa3647ee86820510ca59f45d 100644 (file)
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -2,8 +2,8 @@
  *  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.
  *  
  *  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
@@ -1539,7 +1539,6 @@ 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__));
 
@@ -1584,7 +1583,6 @@ 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.max_uses == 0xffffffff) ? 0 : q_u->info.share.info2.max_uses;
                psd = NULL;
                break;
 #if 0
@@ -1660,8 +1658,8 @@ WERROR _srv_net_share_set_info(pipes_struct *p, SRV_Q_NET_SHARE_SET_INFO *q_u, S
                        return WERR_ACCESS_DENIED;
                }
 
-               slprintf(command, sizeof(command)-1, "%s \"%s\" \"%s\" \"%s\" \"%s\" %d",
-                               lp_change_share_cmd(), dyn_CONFIGFILE, share_name, path, comment, max_connections ); 
+               slprintf(command, sizeof(command)-1, "%s \"%s\" \"%s\" \"%s\" \"%s\"",
+                               lp_change_share_cmd(), dyn_CONFIGFILE, share_name, path, comment);
 
                DEBUG(10,("_srv_net_share_set_info: Running [%s]\n", command ));
                                
@@ -1953,17 +1951,16 @@ WERROR _srv_net_remote_tod(pipes_struct *p, SRV_Q_NET_REMOTE_TOD *q_u, SRV_R_NET
        TIME_OF_DAY_INFO *tod;
        struct tm *t;
        time_t unixdate = time(NULL);
-
        /* 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)) )
+       tod = TALLOC_P(p->mem_ctx, TIME_OF_DAY_INFO);
+       if (!tod)
                return WERR_NOMEM;
 
+       ZERO_STRUCTP(tod);
+ 
        r_u->tod = tod;
        r_u->ptr_srv_tod = 0x1;
        r_u->status = WERR_OK;

diff --git a/source3/utils/status.c b/source3/utils/status.c
index b9f1c161e48ec5558c62d80a5ec1f271548b9657..f19a217aa6581090dfaadb06571342ac6bd07cdd 100644 (file)
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -103,13 +103,13 @@ static void print_share_mode(const struct share_mode_entry *e, const char *share
        static int count;
        if (count==0) {
                d_printf("Locked files:\n");
-               d_printf("Pid          DenyMode   Access      R/W        Oplock           SharePath           Name\n");
-               d_printf("----------------------------------------------------------------------------------------\n");
+               d_printf("Pid    DenyMode   Access      R/W        Oplock           SharePath           Name\n");
+               d_printf("----------------------------------------------------------------------------------\n");
        }
        count++;
 
        if (Ucrit_checkPid(procid_to_pid(&e->pid))) {
-               d_printf("%-11s  ",procid_str_static(&e->pid));
+               d_printf("%s  ",procid_str_static(&e->pid));
                switch (map_share_mode_to_deny_mode(e->share_access,
                                                    e->private_options)) {
                        case DENY_NONE: d_printf("DENY_NONE  "); break;
@@ -166,7 +166,7 @@ static void print_brl(SMB_DEV_T dev, SMB_INO_T ino, struct process_id pid,
        }
        count++;
 
-       d_printf("%08s   %05x:%05x    %s  %9.0f   %9.0f\n", 
+       d_printf("%s   %05x:%05x    %s  %9.0f   %9.0f\n", 
               procid_str_static(&pid), (int)dev, (int)ino, 
               lock_type==READ_LOCK?"R":"W",
               (double)start, (double)size);