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

[sfrench]

The branch, v3-3-test has been updated
       via  8b82d79f0d52aee45bf862a89868f3df483fba84 (commit)
       via  fbb78cfaa71e152c4840c92896f181926de8d58e (commit)
      from  5caabdf64ea3d8ff0ff997a565b7708986c3d9d7 (commit)

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


- Log -----------------------------------------------------------------
commit 8b82d79f0d52aee45bf862a89868f3df483fba84
Merge: fbb78cfaa71e152c4840c92896f181926de8d58e 
5caabdf64ea3d8ff0ff997a565b7708986c3d9d7
Author: Steve French <[EMAIL PROTECTED](none)>
Date:   Tue Aug 26 15:25:55 2008 -0500

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

commit fbb78cfaa71e152c4840c92896f181926de8d58e
Author: Steve French <[EMAIL PROTECTED](none)>
Date:   Tue Aug 26 13:01:15 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 dd878aa..9d2b449 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)) {
@@ -537,7 +537,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