[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  78a6eb5... mount.cifs: check for NULL addr pointer before handling scopeid
      from  f4d8716... s3-docs: Unify capitalization.

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


- Log -----------------------------------------------------------------
commit 78a6eb582d28d92db5ffab6ded40785be54cf540
Author: Jeff Layton <jlayton at redhat.com>
Date:   Wed May 12 07:05:10 2010 -0400

    mount.cifs: check for NULL addr pointer before handling scopeid
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>
    
    Fix bug #7315 (mount.cifs segfaults after upgrade to 2.6.33).

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

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


Changeset truncated at 500 lines:

diff --git a/client/mount.cifs.c b/client/mount.cifs.c
index 0b8d5b4..1b472c2 100644
--- a/client/mount.cifs.c
+++ b/client/mount.cifs.c
@@ -1648,7 +1648,7 @@ mount_retry:
 		}
 	}
 
-	if (addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
+	if (addr && addr->ai_addr->sa_family == AF_INET6 && addr6->sin6_scope_id) {
 		strlcat(options, "%", options_size);
 		current_len = strnlen(options, options_size);
 		optionstail = options + current_len;


-- 
Samba Shared Repository