[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2959-g539f7f1

[sfrench at samba.org]

The branch, v3-2-test has been updated
       via  539f7f1a960686642dc8a3df5cb4aaabcd4d70f8 (commit)
       via  a122df5dc01ed9767c53d77a73aabd44f7c8a7ca (commit)
      from  27b1ae601542ebe2e23ab4ff81eb14f8e03a3caf (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 539f7f1a960686642dc8a3df5cb4aaabcd4d70f8
Merge: a122df5dc01ed9767c53d77a73aabd44f7c8a7ca 27b1ae601542ebe2e23ab4ff81eb14f8e03a3caf
Author: Steve French <stevef at smfhomehp.(none)>
Date:   Tue Aug 26 15:27:07 2008 -0500

    Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test

commit a122df5dc01ed9767c53d77a73aabd44f7c8a7ca
Author: Steve French <stevef at smfhomehp.(none)>
Date:   Tue Aug 26 13:04:44 2008 -0500

    	mount.cifs: unclear error message with "credentials"
    
    Thanks to Christophe Curis for the suggestion

-----------------------------------------------------------------------

Summary of changes:
 source/client/mount.cifs.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index c24c22e..af50cd9 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -196,7 +196,7 @@ static int open_cred_file(char * file_name)
 	line_buf = (char *)malloc(4096);
 	if(line_buf == NULL) {
 		fclose(fs);
-		return -ENOMEM;
+		return ENOMEM;
 	}
 
 	while(fgets(line_buf,4096,fs)) {
@@ -533,7 +533,8 @@ static int parse_options(char ** optionsp, int * filesys_flags)
 			if (value && *value) {
 				rc = open_cred_file(value);
 				if(rc) {
-					printf("error %d opening credential file %s\n",rc, value);
+					printf("error %d (%s) opening credential file %s\n",
+						rc, strerror(rc), value);
 					return 1;
 				}
 			} else {


-- 
Samba Shared Repository