Changeset 773 for branches/samba-3.5.x/source3/smbd/service.c

Timestamp:

Jul 2, 2013, 7:27:06 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Update branch to 3.5.20

File:

• branches/samba-3.5.x/source3/smbd/service.c (modified) (4 diffs)

branches/samba-3.5.x/source3/smbd/service.c

@@ -306 +306 @@
  * Find a service entry.
  *
- * @param service is modified (to canonical form??)
+ * @param service_in is modified (to canonical form??)
+ * and returned in return parameter service.
  **/
 
-int find_service(fstring service)
+int find_service(const char *service_in, fstring service)
 {
         int iService;
         struct smbd_server_connection *sconn = smbd_server_conn;
 
+        if (!service_in) {
+                return -1;
+        }
+
+        fstrcpy(service, service_in);
         all_string_sub(service,"\\","/",0);
 
@@ -400 +406 @@
                         }
 
-                        iService = find_service(defservice);
+                        iService = find_service(defservice, service);
                         if (iService >= 0) {
                                 all_string_sub(service, "_","/",0);
@@ -1183 +1189 @@
                                         current_user_info.smb_name);
                                 map_username(sconn, unix_username);
-                                snum = find_service(unix_username);
+                                snum = find_service(unix_username, unix_username);
                         } 
                         if (snum != -1) {
@@ -1211 +1217 @@
         strlower_m(service);
 
-        snum = find_service(service);
+        snum = find_service(service, service);
 
         if (snum < 0) {