[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  bb6da9f s3: Fix some nonempty blank lines
       via  407a1b3 nss_wins: Fix a type-punned warning
      from  3b4fd35 heimdal_build: Add missing dependencies when building with system heimdal.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bb6da9f06c1159b3b904d654f845442c5a7dec3e
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 1 15:13:30 2011 +0100

    s3: Fix some nonempty blank lines
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Jan  1 16:03:23 CET 2011 on sn-devel-104

commit 407a1b3e7463f02d22670ab033c1a2df89c0ce06
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jan 1 15:08:42 2011 +0100

    nss_wins: Fix a type-punned warning

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

Summary of changes:
 nsswitch/wins.c           |    3 ++-
 source3/libsmb/clidgram.c |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/wins.c b/nsswitch/wins.c
index ac062fe..6e3c84b 100644
--- a/nsswitch/wins.c
+++ b/nsswitch/wins.c
@@ -125,7 +125,8 @@ static struct in_addr *lookup_byname_backend(const char *name, int *count)
 			free(ret);
 			return NULL;
 		}
-		*ret = ((struct sockaddr_in *)&address[0].ss)->sin_addr;
+		*ret = ((struct sockaddr_in *)(void *)&address[0].ss)
+			->sin_addr;
 		free( address );
 		return ret;
 	}
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c
index 50bcbd8..df4d7f4 100644
--- a/source3/libsmb/clidgram.c
+++ b/source3/libsmb/clidgram.c
@@ -9,12 +9,12 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */


-- 
Samba Shared Repository