The branch, v3-6-test has been updated via 664e45a Revert "Fix bug 8196 - Many (newer) header files don't have copyright / GPL header comments." from 5c19b41 s3:idmap_ldap: allow creation of ldap stored mappings for explicitly configured domains.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 664e45ad111ed67b16c0e07b7c2362457d5312c2 Author: Karolin Seeger <ksee...@samba.org> Date: Tue Jun 7 19:52:06 2011 +0200 Revert "Fix bug 8196 - Many (newer) header files don't have copyright / GPL header comments." This reverts commit 6df3ff20620b3262ff232a478312c61a207ed4ff. ----------------------------------------------------------------------- Summary of changes: auth/auth_sam_reply.h | 19 -------- examples/libsmbclient/get_auth_data_fn.h | 3 - lib/compression/mszip.h | 3 - lib/crypto/arcfour.h | 19 -------- lib/crypto/crc32.h | 22 --------- lib/crypto/md4.h | 22 --------- lib/crypto/md5.h | 19 -------- lib/replace/hdr_replace.h | 25 ----------- lib/replace/replace-test.h | 19 -------- lib/replace/system/readline.h | 2 - lib/replace/win32_replace.h | 19 -------- lib/talloc/talloc_testsuite.h | 19 -------- lib/util/data_blob.h | 2 - lib/util/time.h | 2 - lib/util/util_ldb.h | 18 -------- lib/util/util_tdb.h | 19 -------- lib/util/wrap_xattr.h | 19 -------- libcli/auth/libcli_auth.h | 2 - libcli/auth/msrpc_parse.h | 19 -------- libcli/auth/proto.h | 19 -------- libcli/ldap/ldap_ndr.h | 19 -------- libcli/nbt/nbt_proto.h | 19 -------- libcli/netlogon/ndr_netlogon_proto.h | 19 -------- libcli/netlogon/netlogon_proto.h | 19 -------- libcli/smbreadline/smbreadline.h | 19 -------- libcli/util/error.h | 2 - libds/common/flag_mapping.h | 19 -------- librpc/idl/idl_types.h | 23 ---------- librpc/ndr/ndr_backupkey.h | 22 --------- librpc/ndr/ndr_compression.h | 19 -------- librpc/ndr/ndr_dns.h | 23 ---------- librpc/ndr/ndr_spoolss_buf.h | 19 -------- librpc/ndr/ndr_table.h | 19 -------- nsswitch/pam_winbind.h | 22 +--------- nsswitch/winbind_client.h | 22 --------- source3/auth/proto.h | 35 --------------- source3/groupdb/proto.h | 26 ----------- source3/include/ads.h | 20 --------- source3/include/krb5_env.h | 23 ---------- source3/include/krb5_protos.h | 23 ---------- source3/include/mangle.h | 20 --------- source3/include/smb_krb5.h | 19 -------- source3/include/smb_ldap.h | 19 -------- source3/intl/lang_tdb.h | 22 --------- source3/lib/eventlog/proto.h | 26 ----------- source3/lib/idmap_cache.h | 24 ---------- source3/lib/netapi/examples/common.h | 23 +--------- source3/lib/netapi/libnetapi.h | 19 -------- source3/lib/privileges.h | 23 ---------- source3/libads/ads_ldap_protos.h | 23 ---------- source3/libads/ads_proto.h | 35 --------------- source3/libads/ads_status.h | 19 -------- source3/libads/cldap.h | 23 ---------- source3/libads/kerberos_proto.h | 33 -------------- source3/libads/ldap_schema.h | 23 ---------- source3/libgpo/gpo_proto.h | 23 ---------- source3/libnet/libnet_join.h | 23 ---------- source3/librpc/ndr/util.h | 21 --------- source3/libsmb/clidgram.h | 23 ---------- source3/libsmb/errormap_wbc.h | 23 ---------- source3/libsmb/libsmb.h | 2 - source3/libsmb/nmblib.h | 23 ---------- source3/libsmb/proto.h | 2 - source3/locking/proto.h | 25 ----------- source3/nmbd/nmbd.h | 22 --------- source3/nmbd/nmbd_proto.h | 29 ------------ source3/pam_smbpass/general.h | 23 ---------- source3/pam_smbpass/support.h | 23 ---------- source3/passdb/machine_sid.h | 25 ----------- source3/passdb/proto.h | 39 ----------------- source3/printing/load.h | 23 ---------- source3/printing/pcap.h | 5 -- source3/registry/reg_parse_internal.h | 2 - source3/rpc_client/cli_netlogon.h | 24 +---------- source3/rpc_client/cli_spoolss.h | 23 ---------- source3/rpc_client/init_lsa.h | 23 ---------- source3/rpc_client/init_netlogon.h | 23 ---------- source3/rpc_client/init_samr.h | 23 ---------- source3/rpc_client/init_spoolss.h | 23 +--------- source3/rpc_client/util_netlogon.h | 23 ---------- source3/rpc_server/srv_access_check.h | 23 ---------- source3/smbd/proto.h | 48 --------------------- source3/smbd/smbd.h | 2 - source3/winbindd/idmap_proto.h | 29 ------------ source4/dsdb/common/dsdb_dn.h | 22 --------- source4/dsdb/samdb/ldb_modules/password_modules.h | 22 --------- source4/lib/events/events.h | 19 -------- source4/lib/ldb-samba/ldif_handlers.h | 19 -------- source4/lib/ldb/ldb_map/ldb_map_private.h | 23 ---------- source4/lib/ldb/ldb_tdb/ldb_tdb.h | 23 ---------- source4/libcli/raw/signing.h | 2 +- source4/ntvfs/cifs_posix_cli/cifsposix.h | 22 --------- source4/ntvfs/simple/svfs.h | 22 --------- source4/torture/basic/cxd_known.h | 23 ---------- 94 files changed, 5 insertions(+), 1866 deletions(-) Changeset truncated at 500 lines: diff --git a/auth/auth_sam_reply.h b/auth/auth_sam_reply.h index 0a97296..dea6501 100644 --- a/auth/auth_sam_reply.h +++ b/auth/auth_sam_reply.h @@ -1,25 +1,6 @@ #ifndef __AUTH_AUTH_SAM_REPLY_H__ #define __AUTH_AUTH_SAM_REPLY_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2001 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - #undef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) /* this file contains prototypes for functions that are private diff --git a/examples/libsmbclient/get_auth_data_fn.h b/examples/libsmbclient/get_auth_data_fn.h index 92015a5..6b91c97 100644 --- a/examples/libsmbclient/get_auth_data_fn.h +++ b/examples/libsmbclient/get_auth_data_fn.h @@ -1,5 +1,3 @@ -#ifndef __LIBSMBCLIENT_GET_AUTH_DATA_DN_H__ -#define __LIBSMBCLIENT_GET_AUTH_DATA_DN_H__ #include <stdlib.h> static void @@ -82,4 +80,3 @@ get_auth_data_fn(const char * pServer, krb5_set = 1; } -#endif diff --git a/lib/compression/mszip.h b/lib/compression/mszip.h index 0f183ef..bb835f2 100644 --- a/lib/compression/mszip.h +++ b/lib/compression/mszip.h @@ -1,5 +1,3 @@ -#ifndef __LIB_COMPRESSION_MSZIP_H__ -#define __LIB_COMPRESSION_MSZIP_H__ /* mszip decompression - based on cabextract.c code from * Stuart Caie * @@ -33,4 +31,3 @@ struct decomp_state *ZIPdecomp_state(TALLOC_CTX *mem_ctx); #define DECR_INPUT (5) #define DECR_OUTPUT (6) int ZIPdecompress(struct decomp_state *decomp_state, DATA_BLOB *inbuf, DATA_BLOB *outbuf); -#endif diff --git a/lib/crypto/arcfour.h b/lib/crypto/arcfour.h index 1753274..a9f80c4 100644 --- a/lib/crypto/arcfour.h +++ b/lib/crypto/arcfour.h @@ -1,25 +1,6 @@ #ifndef ARCFOUR_HEADER_H #define ARCFOUR_HEADER_H -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - #include "../lib/util/data_blob.h" struct arcfour_state { diff --git a/lib/crypto/crc32.h b/lib/crypto/crc32.h index 34b4352..7854abf 100644 --- a/lib/crypto/crc32.h +++ b/lib/crypto/crc32.h @@ -1,23 +1 @@ -#ifndef __LIB_CRYPTO_CRC32_H__ -#define __LIB_CRYPTO_CRC32_H__ - -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ uint32_t crc32_calc_buffer(const uint8_t *buf, size_t size); -#endif diff --git a/lib/crypto/md4.h b/lib/crypto/md4.h index 6811b21..234e488 100644 --- a/lib/crypto/md4.h +++ b/lib/crypto/md4.h @@ -1,23 +1 @@ -#ifndef __LIB_CRYPTO_MD4_H__ -#define __LIB_CRYPTO_MD4_H__ - -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ void mdfour(uint8_t *out, const uint8_t *in, int n); -#endif diff --git a/lib/crypto/md5.h b/lib/crypto/md5.h index e1dcbd3..4064d6f 100644 --- a/lib/crypto/md5.h +++ b/lib/crypto/md5.h @@ -5,25 +5,6 @@ #define HEADER_MD5_H #endif -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - struct MD5Context { uint32_t buf[4]; uint32_t bits[2]; diff --git a/lib/replace/hdr_replace.h b/lib/replace/hdr_replace.h index 134e354..6cfa50f 100644 --- a/lib/replace/hdr_replace.h +++ b/lib/replace/hdr_replace.h @@ -1,27 +1,2 @@ -#ifndef __LIB_REPLACE_HDR_REPLACE_H__ -#define __LIB_REPLACE_HDR_REPLACE_H__ - -/* - Unix SMB/CIFS implementation. - - Winbind daemon for ntdom nss module - - Copyright (C) Tim Potter 2000 - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - /* this is a replacement header for a missing system header */ #include "replace.h" -#endif diff --git a/lib/replace/replace-test.h b/lib/replace/replace-test.h index 8c299ba..95fb7ab 100644 --- a/lib/replace/replace-test.h +++ b/lib/replace/replace-test.h @@ -1,25 +1,6 @@ #ifndef __LIB_REPLACE_REPLACE_TEST_H__ #define __LIB_REPLACE_REPLACE_TEST_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - bool torture_local_replace(struct torture_context *ctx); int libreplace_test_strptime(void); int test_readdir_os2_delete(void); diff --git a/lib/replace/system/readline.h b/lib/replace/system/readline.h index 439b533..e6b8fb9 100644 --- a/lib/replace/system/readline.h +++ b/lib/replace/system/readline.h @@ -3,8 +3,6 @@ /* Unix SMB/CIFS implementation. - (C) 2001 Samba Team. - Readline wrappers ** NOTE! The following LGPL license applies to the replace diff --git a/lib/replace/win32_replace.h b/lib/replace/win32_replace.h index 98b9c5b..9901e72 100644 --- a/lib/replace/win32_replace.h +++ b/lib/replace/win32_replace.h @@ -1,25 +1,6 @@ #ifndef _WIN32_REPLACE_H #define _WIN32_REPLACE_H -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - #ifdef HAVE_WINSOCK2_H #include <winsock2.h> #endif diff --git a/lib/talloc/talloc_testsuite.h b/lib/talloc/talloc_testsuite.h index 21607f1..acb9701 100644 --- a/lib/talloc/talloc_testsuite.h +++ b/lib/talloc/talloc_testsuite.h @@ -1,25 +1,6 @@ #ifndef __LIB_TALLOC_TALLOC_TESTSUITE_H__ #define __LIB_TALLOC_TALLOC_TESTSUITE_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - struct torture_context; bool torture_local_talloc(struct torture_context *tctx); diff --git a/lib/util/data_blob.h b/lib/util/data_blob.h index c3da975..83e6cd5 100644 --- a/lib/util/data_blob.h +++ b/lib/util/data_blob.h @@ -2,8 +2,6 @@ Unix SMB/CIFS implementation. DATA BLOB - (C) 2011 Samba Team. - 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 diff --git a/lib/util/time.h b/lib/util/time.h index d354896..3a40634 100644 --- a/lib/util/time.h +++ b/lib/util/time.h @@ -2,8 +2,6 @@ Unix SMB/CIFS implementation. time utility functions - (C) 2011 Samba Team. - 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 diff --git a/lib/util/util_ldb.h b/lib/util/util_ldb.h index 5257b65..d2bc3b0 100644 --- a/lib/util/util_ldb.h +++ b/lib/util/util_ldb.h @@ -1,24 +1,6 @@ #ifndef __LIB_UTIL_UTIL_LDB_H__ #define __LIB_UTIL_UTIL_LDB_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ struct ldb_dn; /* The following definitions come from lib/util/util_ldb.c */ diff --git a/lib/util/util_tdb.h b/lib/util/util_tdb.h index 24d8f48..c11a347 100644 --- a/lib/util/util_tdb.h +++ b/lib/util/util_tdb.h @@ -1,25 +1,6 @@ #ifndef _____LIB_UTIL_UTIL_TDB_H__ #define _____LIB_UTIL_UTIL_TDB_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - /*************************************************************** Make a TDB_DATA and keep the const warning in one place ****************************************************************/ diff --git a/lib/util/wrap_xattr.h b/lib/util/wrap_xattr.h index 5dc5d28..64b28d2 100644 --- a/lib/util/wrap_xattr.h +++ b/lib/util/wrap_xattr.h @@ -1,25 +1,6 @@ #ifndef __LIB_UTIL_WRAP_XATTR_H__ #define __LIB_UTIL_WRAP_XATTR_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - ssize_t wrap_fgetxattr(int fd, const char *name, void *value, size_t size); ssize_t wrap_getxattr(const char *path, const char *name, void *value, size_t size); int wrap_fsetxattr(int fd, const char *name, void *value, size_t size, int flags); diff --git a/libcli/auth/libcli_auth.h b/libcli/auth/libcli_auth.h index 6ee7e9d..c5c7a7b 100644 --- a/libcli/auth/libcli_auth.h +++ b/libcli/auth/libcli_auth.h @@ -1,8 +1,6 @@ /* samba -- Unix SMB/CIFS implementation. - (C) 2011 Samba Team. - 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 diff --git a/libcli/auth/msrpc_parse.h b/libcli/auth/msrpc_parse.h index be49252..d976a95 100644 --- a/libcli/auth/msrpc_parse.h +++ b/libcli/auth/msrpc_parse.h @@ -1,25 +1,6 @@ #ifndef _LIBCLI_AUTH_MSRPC_PARSE_H__ #define _LIBCLI_AUTH_MSRPC_PARSE_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - #undef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h index b561dc1..34a0052 100644 --- a/libcli/auth/proto.h +++ b/libcli/auth/proto.h @@ -1,25 +1,6 @@ #ifndef _LIBCLI_AUTH_PROTO_H__ #define _LIBCLI_AUTH_PROTO_H__ -/* - Unix SMB/CIFS implementation. - - (C) 2011 Samba Team. - - 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 <http://www.gnu.org/licenses/>. -*/ - #undef _PRINTF_ATTRIBUTE #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) diff --git a/libcli/ldap/ldap_ndr.h b/libcli/ldap/ldap_ndr.h -- Samba Shared Repository