From: Andrew Bartlett Date: Mon, 19 May 2008 22:03:35 +0000 (+1000) Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=343fea32ccd205c68b23ee894a8ab4f9413af746;p=metze%2Fsamba%2Fwip.git Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local Fix config.mk due to changing syntax. Conflicts: source/libcli/config.mk source/nbt_server/config.mk (This used to be commit 6a1c76f29f78183f44dfac6f468c5e728d2cb2cf) --- 343fea32ccd205c68b23ee894a8ab4f9413af746 diff --cc source4/auth/ntlm/pam_errors.h index 904950caa6a5,904950caa6a5..959e1f351714 --- a/source4/auth/ntlm/pam_errors.h +++ b/source4/auth/ntlm/pam_errors.h @@@ -1,16 -1,16 +1,26 @@@ ++/* ++ * Unix SMB/CIFS implementation. ++ * PAM error mapping functions ++ * Copyright (C) Andrew Bartlett 2002 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * 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 . ++ */ ++ #ifndef __AUTH_NTLM_PAM_ERRORS_H__ #define __AUTH_NTLM_PAM_ERRORS_H__ --#undef _PRINTF_ATTRIBUTE --#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) --/* This file was automatically generated by mkproto.pl. DO NOT EDIT */ -- --/* this file contains prototypes for functions that are private -- * to this subsystem or library. These functions should not be -- * used outside this particular subsystem! */ -- -- --/* The following definitions come from auth/ntlm/pam_errors.c */ ++/* The following definitions come from auth/pam_errors.c */ /***************************************************************************** @@@ -32,8 -32,8 +42,6 @@@ NTSTATUS pam_to_nt_status(int pam_error convert an NT status32 code to a PAM error *****************************************************************************/ int nt_status_to_pam(NTSTATUS nt_status); --#undef _PRINTF_ATTRIBUTE --#define _PRINTF_ATTRIBUTE(a1, a2) #endif /* __AUTH_NTLM_PAM_ERRORS_H__ */ diff --cc source4/libcli/config.mk index 08c08043a693,dbd05b57bc6f..c8056dbe632e --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@@ -53,14 -54,8 +54,17 @@@ LIBCLI_NBT_OBJ_FILES = $(addprefix $(li namerefresh.o \ namerelease.o) + $(eval $(call proto_header_template,$(libclisrcdir)/nbt/nbt_proto.h,$(LIBCLI_NBT_OBJ_FILES:.o=.c))) + +[SUBSYSTEM::LIBCLI_NETLOGON] - PRIVATE_PROTO_HEADER = netlogon_proto.h +PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT \ + NDR_SECURITY LIBSAMBA-UTIL + +LIBCLI_NETLOGON_OBJ_FILES = $(addprefix libcli/, \ + netlogon.o) + ++$(eval $(call proto_header_template,$(libclisrcdir)/nbt/nbt_proto.h,$(LIBCLI_NETLOGON_OBJ_FILES:.o=.c))) ++ [PYTHON::python_libcli_nbt] SWIG_FILE = swig/libcli_nbt.i PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG @@@ -71,12 -66,12 +75,12 @@@ python_libcli_nbt_OBJ_FILES = $(libclis SWIG_FILE = swig/libcli_smb.i PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-HOSTCONFIG - python_libcli_smb_OBJ_FILES = libcli/swig/libcli_smb_wrap.o + python_libcli_smb_OBJ_FILES = $(libclisrcdir)/swig/libcli_smb_wrap.o [SUBSYSTEM::LIBCLI_DGRAM] -PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE +PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON - LIBCLI_DGRAM_OBJ_FILES = $(addprefix libcli/dgram/, \ + LIBCLI_DGRAM_OBJ_FILES = $(addprefix $(libclisrcdir)/dgram/, \ dgramsocket.o \ mailslot.o \ netlogon.o \ @@@ -84,13 -80,12 +88,12 @@@ [SUBSYSTEM::LIBCLI_CLDAP] PUBLIC_DEPENDENCIES = LIBCLI_LDAP -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB LIBCLI_NETLOGON - LIBCLI_CLDAP_OBJ_FILES = libcli/cldap/cldap.o - # PUBLIC_HEADERS += libcli/cldap/cldap.h + LIBCLI_CLDAP_OBJ_FILES = $(libclisrcdir)/cldap/cldap.o + # PUBLIC_HEADERS += $(libclisrcdir)/cldap/cldap.h [SUBSYSTEM::LIBCLI_WREPL] - PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS \ LIBPACKET LIBNDR diff --cc source4/librpc/config.mk index 0b136644d839,b9f79a51e61f..c2a8d536b212 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@@ -322,14 -329,14 +329,14 @@@ NDR_NOTIFY_OBJ_FILES = $(gen_ndrsrcdir) [SUBSYSTEM::NDR_SCHANNEL] PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT - NDR_SCHANNEL_OBJ_FILES = librpc/gen_ndr/ndr_schannel.o + NDR_SCHANNEL_OBJ_FILES = $(gen_ndrsrcdir)/ndr_schannel.o [SUBSYSTEM::NDR_NBT] -PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY +PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY NDR_SAMR - NDR_NBT_OBJ_FILES = librpc/gen_ndr/ndr_nbt.o + NDR_NBT_OBJ_FILES = $(gen_ndrsrcdir)/ndr_nbt.o - PUBLIC_HEADERS += librpc/gen_ndr/nbt.h + PUBLIC_HEADERS += $(gen_ndrsrcdir)/nbt.h [SUBSYSTEM::NDR_WINSREPL] PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT diff --cc source4/nbt_server/config.mk index eb1aea65d795,bb5dec766125..b17fd4ce521a --- a/source4/nbt_server/config.mk +++ b/source4/nbt_server/config.mk @@@ -44,7 -46,9 +46,9 @@@ PRIVATE_DEPENDENCIES = # End SUBSYSTEM NBTD_DGRAM ####################### - NBTD_DGRAM_OBJ_FILES = $(addprefix nbt_server/dgram/, request.o netlogon.o browse.o) -NBTD_DGRAM_OBJ_FILES = $(addprefix $(nbt_serversrcdir)/dgram/, request.o netlogon.o ntlogon.o browse.o) ++NBTD_DGRAM_OBJ_FILES = $(addprefix $(nbt_serversrcdir)/dgram/, request.o netlogon.o browse.o) + + $(eval $(call proto_header_template,$(nbt_serversrcdir)/dgram/proto.h,$(NBTD_DGRAM_OBJ_FILES:.o=.c))) ####################### # Start SUBSYSTEM NBTD