Changeset 124 for branches/samba-3.0/source/rpc_server

Timestamp:

Mar 12, 2008, 9:08:18 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

Location:

branches/samba-3.0/source/rpc_server

Files:

• srv_lsa_nt.c (modified) (3 diffs)
• srv_samr_nt.c (modified) (1 diff)
• srv_spoolss_nt.c (modified) (1 diff)
• srv_srvsvc_nt.c (modified) (2 diffs)

branches/samba-3.0/source/rpc_server/srv_lsa_nt.c

@@ -1033 +1033 @@
 }
 
+static int lsa_lookup_level_to_flags(uint16 level)
+{
+        int flags;
+
+        switch (level) {
+                case 1:
+                        flags = LOOKUP_NAME_ALL;
+                        break;
+                case 2:
+                        flags = LOOKUP_NAME_DOMAIN|LOOKUP_NAME_REMOTE|LOOKUP_NAME_ISOLATED;
+                        break;
+                case 3:
+                        flags = LOOKUP_NAME_DOMAIN|LOOKUP_NAME_ISOLATED;
+                        break;
+                case 4:
+                case 5:
+                case 6:
+                default:
+                        flags = LOOKUP_NAME_NONE;
+                        break;
+        }
+
+        return flags;
+}
+
 /***************************************************************************
 lsa_reply_lookup_names
@@ -1052 +1077 @@
         }
                 
-        /* Probably the lookup_level is some sort of bitmask. */
-        if (q_u->lookup_level == 1) {
-                flags = LOOKUP_NAME_ALL;
-        }
+        flags = lsa_lookup_level_to_flags(q_u->lookup_level);
 
         ref = TALLOC_ZERO_P(p->mem_ctx, DOM_R_REF);
@@ -1121 +1143 @@
                 DEBUG(5,("_lsa_lookup_names2: truncating name lookup list to %d\n", num_entries));
         }
-                
-        /* Probably the lookup_level is some sort of bitmask. */
-        if (q_u->lookup_level == 1) {
-                flags = LOOKUP_NAME_ALL;
-        }
+
+        flags = lsa_lookup_level_to_flags(q_u->lookup_level);
 
         ref = TALLOC_ZERO_P(p->mem_ctx, DOM_R_REF);

branches/samba-3.0/source/rpc_server/srv_samr_nt.c

@@ -2508 +2508 @@
 
         become_root();
-        /* Lookup in our local databases (only LOOKUP_NAME_ISOLATED set)
+        /* Lookup in our local databases (LOOKUP_NAME_REMOTE not set)
          * whether the name already exists */
-        result = lookup_name(mem_ctx, new_name, LOOKUP_NAME_ISOLATED,
+        result = lookup_name(mem_ctx, new_name, LOOKUP_NAME_LOCAL,
                              NULL, NULL, NULL, &type);
         unbecome_root();

branches/samba-3.0/source/rpc_server/srv_spoolss_nt.c

@@ -1404 +1404 @@
         len = unistrlen(devmode->formname.buffer);
         if (len != -1) {
-                d->devicename.buffer = TALLOC_ARRAY(ctx, uint16, len);
-                if (!d->devicename.buffer) {
+                d->formname.buffer = TALLOC_ARRAY(ctx, uint16, len);
+                if (!d->formname.buffer) {
                         return NULL;
                 }

branches/samba-3.0/source/rpc_server/srv_srvsvc_nt.c

@@ -206 +206 @@
 static uint32 get_share_type(int snum) 
 {
-        char *net_name = lp_servicename(snum);
-        int len_net_name = strlen(net_name);
-        
         /* work out the share type */
         uint32 type = STYPE_DISKTREE;
@@ -216 +213 @@
         if (strequal(lp_fstype(snum), "IPC"))
                 type = STYPE_IPC;
-        if (net_name[len_net_name-1] == '$')
+        if (lp_administrative_share(snum))
                 type |= STYPE_HIDDEN;