diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
| commit | b5d84a74d146cfe0d2e0c336a88bd269ad61cded (patch) | |
| tree | 8acad6b634cfe312144f92f8a0fb6ab44b47cd19 /source4/lib/policy | |
| parent | 237f1cca028881a57f961884f427673907c1535a (diff) | |
| parent | 1f474f4a545752f7ac0ad402d01d1e768b973dbe (diff) | |
| download | samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.gz samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.bz2 samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
Diffstat (limited to 'source4/lib/policy')
| -rw-r--r-- | source4/lib/policy/adm.h | 2 | ||||
| -rw-r--r-- | source4/lib/policy/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/policy/dumpadm.c | 2 | ||||
| -rw-r--r-- | source4/lib/policy/lex.c | 2 | ||||
| -rw-r--r-- | source4/lib/policy/lex.l | 2 | ||||
| -rw-r--r-- | source4/lib/policy/parse_adm.y | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/source4/lib/policy/adm.h b/source4/lib/policy/adm.h index 90889fe5fa..c541ced6ff 100644 --- a/source4/lib/policy/adm.h +++ b/source4/lib/policy/adm.h @@ -5,7 +5,7 @@ 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 2 of the License, or + 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, diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk index 70fb289189..9a8e60bfbe 100644 --- a/source4/lib/policy/config.mk +++ b/source4/lib/policy/config.mk @@ -1,6 +1,6 @@ [SUBSYSTEM::LIBPOLICY] CFLAGS = -Iheimdal/lib/roken -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBTALLOC CHARSET LIBPOLICY_OBJ_FILES = lib/policy/lex.o lib/policy/parse_adm.o @@ -9,6 +9,6 @@ lib/policy/lex.l: lib/policy/parse_adm.h lib/policy/parse_adm.h: lib/policy/parse_adm.c [BINARY::dumpadm] -PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET +PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-HOSTCONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET dumpadm_OBJ_FILES = lib/policy/dumpadm.o diff --git a/source4/lib/policy/dumpadm.c b/source4/lib/policy/dumpadm.c index 1553ce62f6..2ed5abf111 100644 --- a/source4/lib/policy/dumpadm.c +++ b/source4/lib/policy/dumpadm.c @@ -5,7 +5,7 @@ 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 2 of the License, or + 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, diff --git a/source4/lib/policy/lex.c b/source4/lib/policy/lex.c index c2899aa808..6d524445c9 100644 --- a/source4/lib/policy/lex.c +++ b/source4/lib/policy/lex.c @@ -572,7 +572,7 @@ char *yytext; 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 2 of the License, or + 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, diff --git a/source4/lib/policy/lex.l b/source4/lib/policy/lex.l index 199cd228c0..dc1f0aa34e 100644 --- a/source4/lib/policy/lex.l +++ b/source4/lib/policy/lex.l @@ -5,7 +5,7 @@ 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 2 of the License, or + 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, diff --git a/source4/lib/policy/parse_adm.y b/source4/lib/policy/parse_adm.y index 1dc21cf1d3..23c5e7730e 100644 --- a/source4/lib/policy/parse_adm.y +++ b/source4/lib/policy/parse_adm.y @@ -5,7 +5,7 @@ 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 2 of the License, or + 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, |