Changeset 745 for trunk/server/source3/libsmb/libsmb_path.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libsmb/libsmb_path.c (modified) (20 diffs)

trunk/server/source3/libsmb/libsmb_path.c

@@ -8 +8 @@
    Copyright (C) Derrell Lipman 2003-2008
    Copyright (C) Jeremy Allison 2007, 2008
-   
+
    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
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -61 +61 @@
         size_t newlen = 1;
         char *p, *dest;
-        
+
         if (old_length == 0) {
                 return 0;
         }
-        
+
         *pp_dest = NULL;
         for (i = 0; i < old_length; ) {
                 unsigned char character = src[i++];
-                
+
                 if (character == '%') {
                         int a = i+1 < old_length ? hex2int(src[i]) : -1;
                         int b = i+1 < old_length ? hex2int(src[i+1]) : -1;
-                        
+
                         /* Replace valid sequence */
                         if (a != -1 && b != -1) {
@@ -88 +88 @@
                 newlen++;
         }
-        
+
         dest = TALLOC_ARRAY(ctx, char, newlen);
         if (!dest) {
                 return err_count;
         }
-        
+
         err_count = 0;
         for (p = dest, i = 0; i < old_length; ) {
                 unsigned char character = src[i++];
-                
+
                 if (character == '%') {
                         int a = i+1 < old_length ? hex2int(src[i]) : -1;
                         int b = i+1 < old_length ? hex2int(src[i+1]) : -1;
-                        
+
                         /* Replace valid sequence */
                         if (a != -1 && b != -1) {
@@ -116 +116 @@
                 *p++ = character;
         }
-        
+
         *p = '\0';
         *pp_dest = dest;
@@ -130 +130 @@
         char *pdest;
         int ret = urldecode_talloc(frame, &pdest, src);
-        
+
         if (pdest) {
                 strlcpy(dest, pdest, max_dest_len);
@@ -152 +152 @@
 {
         char hex[] = "0123456789ABCDEF";
-        
+
         for (; *src != '\0' && max_dest_len >= 3; src++) {
-                
+
                 if ((*src < '0' &&
                      *src != '-' &&
@@ -173 +173 @@
                 }
         }
-        
+
         *dest++ = '\0';
         max_dest_len--;
-        
+
         return max_dest_len;
 }
@@ -236 +236 @@
         char *workgroup = NULL;
         int len;
-        
+
         /* Ensure these returns are at least valid pointers. */
         *pp_server = talloc_strdup(ctx, "");
@@ -243 +243 @@
         *pp_user = talloc_strdup(ctx, "");
         *pp_password = talloc_strdup(ctx, "");
-        
+
         if (!*pp_server || !*pp_share || !*pp_path ||
             !*pp_user || !*pp_password) {
                 return -1;
         }
-        
+
         /*
          * Assume we wont find an authentication domain to parse, so default
@@ -257 +257 @@
                         talloc_strdup(ctx, smbc_getWorkgroup(context));
         }
-        
+
         if (pp_options) {
                 *pp_options = talloc_strdup(ctx, "");
         }
         s = talloc_strdup(ctx, fname);
-        
+
         /* see if it has the right prefix */
         len = strlen(SMBC_PREFIX);
@@ -268 +268 @@
                 return -1; /* What about no smb: ? */
         }
-        
+
         p = s + len;
-        
+
         /* Watch the test below, we are testing to see if we should exit */
-        
+
         if (strncmp(p, "//", 2) && strncmp(p, "\\\\", 2)) {
                 DEBUG(1, ("Invalid path (does not begin with smb://"));
                 return -1;
         }
-        
+
         p += 2;  /* Skip the double slash */
-        
+
         /* See if any options were specified */
         if ((q = strrchr(p, '?')) != NULL ) {
                 /* There are options.  Null terminate here and point to them */
                 *q++ = '\0';
-                
+
                 DEBUG(4, ("Found options '%s'", q));
-                
+
                 /* Copy the options */
                 if (pp_options && *pp_options != NULL) {
@@ -293 +293 @@
                 }
         }
-        
+
         if (*p == '\0') {
                 goto decoding;
         }
-        
+
         if (*p == '/') {
                 int wl = strlen(smbc_getWorkgroup(context));
-                
+
                 if (wl > 16) {
                         wl = 16;
                 }
-                
+
                 *pp_server = talloc_strdup(ctx, smbc_getWorkgroup(context));
                 if (!*pp_server) {
@@ -312 +312 @@
                 return 0;
         }
-        
+
         /*
          * ok, its for us. Now parse out the server, share etc.
@@ -319 +319 @@
          * exists ...
          */
-        
+
         /* check that '@' occurs before '/', if '/' exists at all */
         q = strchr_m(p, '@');
@@ -326 +326 @@
                 char *userinfo = NULL;
                 const char *u;
-                
+
                 next_token_no_ltrim_talloc(ctx, &p, &userinfo, "@");
                 if (!userinfo) {
@@ -332 +332 @@
                 }
                 u = userinfo;
-                
+
                 if (strchr_m(u, ';')) {
                         next_token_no_ltrim_talloc(ctx, &u, &workgroup, ";");
@@ -342 +342 @@
                         }
                 }
-                
+
                 if (strchr_m(u, ':')) {
                         next_token_no_ltrim_talloc(ctx, &u, pp_user, ":");
@@ -359 +359 @@
                 }
         }
-        
+
         if (!next_token_talloc(ctx, &p, pp_server, "/")) {
                 return -1;
         }
-        
+
         if (*p == (char)0) {
                 goto decoding;  /* That's it ... */
         }
-        
+
         if (!next_token_talloc(ctx, &p, pp_share, "/")) {
                 return -1;
         }
-        
+
         /*
          * Prepend a leading slash if there's a file path, as required by
@@ -387 +387 @@
         }
         string_replace(*pp_path, '/', '\\');
-        
+
 decoding:
-        
         (void) urldecode_talloc(ctx, pp_path, *pp_path);
         (void) urldecode_talloc(ctx, pp_server, *pp_server);
@@ -408 +407 @@
                                            *pp_user,
                                            *pp_password);
-        
         return 0;
 }