[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1302-gecb52f5

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  ecb52f50fe3ec8beda48b6c88e9a3ae5a6a98d52 (commit)
      from  0599d57efff0f417f75510e8b08c3cb7b4bcfcd8 (commit)

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


- Log -----------------------------------------------------------------
commit ecb52f50fe3ec8beda48b6c88e9a3ae5a6a98d52
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date:   Fri Jan 11 23:56:48 2008 -0800

    Fix CID 475. work should not be checked against NULL
    here as it can never be null.
    Jeremy.

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

Summary of changes:
 source/nmbd/nmbd_incomingdgrams.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nmbd/nmbd_incomingdgrams.c 
b/source/nmbd/nmbd_incomingdgrams.c
index c0aa385..75ab941 100644
--- a/source/nmbd/nmbd_incomingdgrams.c
+++ b/source/nmbd/nmbd_incomingdgrams.c
@@ -257,7 +257,7 @@ void process_local_master_announce(struct subnet_record 
*subrec, struct packet_s
        uint32 servertype = IVAL(buf,23);
        fstring comment;
        unstring work_name;
-       struct work_record *work;
+       struct work_record *work = NULL;
        struct server_record *servrec;
        unstring source_name;
 
@@ -344,7 +344,7 @@ a local master browser for workgroup %s and we think we are 
master. Forcing elec
                 * This server is announcing it is going down. Remove it from 
the
                 * workgroup.
                 */
-               if(!is_myname(server_name) && (work != NULL) &&
+               if(!is_myname(server_name) &&
                                ((servrec = find_server_in_workgroup( work, 
server_name))!=NULL)) {
                        remove_server_from_workgroup( work, servrec);
                }


-- 
Samba Shared Repository