summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve French <sfrench@samba.org>2004-04-04 15:20:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:03 -0500
commit70c6c78395d672f17c9f9196787a5866b15a325d (patch)
tree3118c239b7466c47a5f182c45abd593063891a19
parentc2ff214772ac1934731938b3804d37e514e45c32 (diff)
downloadsamba-70c6c78395d672f17c9f9196787a5866b15a325d.tar.gz
samba-70c6c78395d672f17c9f9196787a5866b15a325d.tar.bz2
samba-70c6c78395d672f17c9f9196787a5866b15a325d.zip
r18: Fix free of incremented pointer
(This used to be commit dfac69be4fc63745e2d0b4cecb8106286c7c8ca0)
-rwxr-xr-xsource3/client/mount.cifs.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index a2f9ebf45c..c31a9d66b3 100755
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -116,13 +116,12 @@ static int open_cred_file(char * file_name)
/* parse line from credential file */
/* eat leading white space */
- for(i=0;i<4096;i++) {
+ for(i=0;i<4086;i++) {
if((line_buf[i] != ' ') && (line_buf[i] != '\t'))
break;
/* if whitespace - skip past it */
- line_buf++;
}
- if (strncasecmp("username",line_buf,8) == 0) {
+ if (strncasecmp("username",line_buf+i,8) == 0) {
temp_val = strchr(line_buf + i,'=');
if(temp_val) {
/* go past equals sign */
@@ -146,7 +145,7 @@ static int open_cred_file(char * file_name)
strncpy(user_name,temp_val, length);
}
}
- } else if (strncasecmp("password",line_buf,8) == 0) {
+ } else if (strncasecmp("password",line_buf+i,8) == 0) {
temp_val = strchr(line_buf+i,'=');
if(temp_val) {
/* go past equals sign */
@@ -376,7 +375,7 @@ static int parse_options(char * options, int * filesys_flags)
if (value && *value) {
rc = open_cred_file(value);
if(rc) {
- printf("error %d opening credential file %s",rc, value);
+ printf("error %d opening credential file %s\n",rc, value);
return 1;
}
} else {