Attachment 252681 Details for Bug 370501 – patch -- add function to normalize UNC string

[patch] patch -- add function to normalize UNC string

samba-3.2-mount.cifs-normalize-unc.patch (text/plain), 2.38 KB, created by Jeff Layton on 2007-11-09 13:15:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-11-09 13:15:16 UTC

Size: 2.38 KB

patch

obsolete

>Index: samba3/source/client/mount.cifs.c
>===================================================================
>--- samba3/source/client/mount.cifs.c	(revision 25913)
>+++ samba3/source/client/mount.cifs.c	(working copy)
>@@ -62,6 +62,8 @@
> #define MS_BIND 4096
> #endif
> 
>+#define MAX_UNC_LEN 1024
>+
> #define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
> 
> const char *thisprogram;
>@@ -747,17 +749,55 @@
> 	return domainnm;
> }
> 
>+/*
>+ * Change first 2 chars to '\\'. Convert all '/' into '\\', unless they're
>+ * escaped, in which case, just remove the escape character
>+ */
>+static int
>+normalize_unc(char *unc)
>+{
>+	char *oldunc, *oldpp, *newpp;
>+
>+	oldunc = strndup(unc, MAX_UNC_LEN);	
>+	if (oldunc == NULL)
>+		return -ENOMEM;
>+
>+	oldpp = oldunc;
>+	newpp = unc;
>+
>+	while (*oldpp) {
>+		if (*oldpp == '\\' && *(oldpp+1) == '/') {
>+			*newpp = '/';
>+			oldpp++;
>+		} else if (*oldpp == '/') {
>+			*newpp = '\\';
>+		} else {
>+			*newpp = *oldpp;
>+		}
>+		newpp++;
>+		oldpp++;
>+	}
>+	*newpp = '\0';
>+
>+	/* change these back to '/' to make /proc/mounts look nice */
>+	unc[0] = '/';
>+	unc[1] = '/';
>+
>+	free(oldunc);
>+	return 0;
>+}
>+
> /* Note that caller frees the returned buffer if necessary */
> static char * parse_server(char ** punc_name)
> {
> 	char * unc_name = *punc_name;
>-	int length = strnlen(unc_name,1024);
>+	int length = strnlen(unc_name, MAX_UNC_LEN);
> 	char * share;
> 	char * ipaddress_string = NULL;
> 	struct hostent * host_entry = NULL;
> 	struct in_addr server_ipaddr;
> 
>-	if(length > 1023) {
>+	if(length > (MAX_UNC_LEN - 1)) {
> 		printf("mount error: UNC name too long");
> 		return NULL;
> 	}
>@@ -797,18 +837,16 @@
> 			}
> 		} else {
> continue_unc_parsing:
>-			unc_name[0] = '/';
>-			unc_name[1] = '/';
>+			normalize_unc(unc_name);
> 			unc_name += 2;
>-			if ((share = strchr(unc_name, '/')) || 
>-				(share = strchr(unc_name,'\\'))) {
>+			if ((share = strchr(unc_name,'\\'))) {
> 				*share = 0;  /* temporarily terminate the string */
> 				share += 1;
> 				if(got_ip == 0) {
> 					host_entry = gethostbyname(unc_name);
> 				}
>-				*(share - 1) = '/'; /* put the slash back */
>-				if ((prefixpath = strchr(share, '/'))) {
>+				*(share - 1) = '/'; /* put forward slash back (so that /proc/mounts looks nice) */
>+				if ((prefixpath = strchr(share, '\\'))) {
> 					*prefixpath = 0;  /* permanently terminate the string */
> 					if (!strlen(++prefixpath))
> 						prefixpath = NULL; /* this needs to be done explicitly */

Actions: View | Diff

Attachments on bug 370501: 251461 | 251491 | 252171 | 252681 | 253241 | 256911