rename ldap_common.c -> ldap_util.c

diff --git a/MANIFEST b/MANIFEST
index 2656f8ff66ecad1851e2a824a869377b4af7bdf5..c909b72cf08fff89df5441328987cd5e4c6c151f 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -305,8 +305,8 @@ plugins/sudoers/iolog.c
 plugins/sudoers/iolog.h
 plugins/sudoers/iolog_path.c
 plugins/sudoers/ldap.c
-plugins/sudoers/ldap_common.c
 plugins/sudoers/ldap_conf.c
+plugins/sudoers/ldap_util.c
 plugins/sudoers/linux_audit.c
 plugins/sudoers/linux_audit.h
 plugins/sudoers/locale.c

diff --git a/configure b/configure
index 2a5a54b8816905d4a2b58f577e118e3513c8f8c2..6af6c983bc2a3e05890f187686884bfef4a311fb 100755 (executable)
--- a/configure
+++ b/configure
@@ -4621,8 +4621,8 @@ if test "${with_sssd+set}" = set; then :
   withval=$with_sssd; case $with_sssd in
     yes)       SUDOERS_OBJS="${SUDOERS_OBJS} sssd.lo"
                case "$SUDOERS_OBJS" in
-                   *ldap_common.lo*) ;;
-                   *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_common.lo";;
+                   *ldap_util.lo*) ;;
+                   *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";;
                esac
                $as_echo "#define HAVE_SSSD 1" >>confdefs.h
 
@@ -24509,8 +24509,8 @@ fi
     fi
     SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo ldap_conf.lo"
     case "$SUDOERS_OBJS" in
-       *ldap_common.lo*) ;;
-       *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_common.lo";;
+       *ldap_util.lo*) ;;
+       *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";;
     esac
     LDAP=""
 

diff --git a/configure.ac b/configure.ac
index 96191841e9cc896c76029e393e848d1c5d5a5159..8d5c8685b274b53b10891970bb4370a3a1dd7149 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -380,8 +380,8 @@ AC_ARG_WITH(sssd, [AS_HELP_STRING([--with-sssd], [enable SSSD support])],
 [case $with_sssd in
     yes)       SUDOERS_OBJS="${SUDOERS_OBJS} sssd.lo"
                case "$SUDOERS_OBJS" in
-                   *ldap_common.lo*) ;;
-                   *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_common.lo";;
+                   *ldap_util.lo*) ;;
+                   *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";;
                esac
                AC_DEFINE(HAVE_SSSD)
                ;;
@@ -3736,8 +3736,8 @@ if test ${with_ldap-'no'} != "no"; then
     fi
     SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo ldap_conf.lo"
     case "$SUDOERS_OBJS" in
-       *ldap_common.lo*) ;;
-       *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_common.lo";;
+       *ldap_util.lo*) ;;
+       *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";;
     esac
     LDAP=""
 

diff --git a/mkdep.pl b/mkdep.pl
index d0a6200537ca4bf9967cbb0c67ef570659b20136..96606f4695bc0bf97575beaea652032b29d62dde 100755 (executable)
--- a/mkdep.pl
+++ b/mkdep.pl
@@ -79,7 +79,7 @@ sub mkdep {
     $makefile =~ s:\@DEV\@::g;
     $makefile =~ s:\@COMMON_OBJS\@:aix.lo event_poll.lo event_select.lo:;
     $makefile =~ s:\@SUDO_OBJS\@:openbsd.o preload.o selinux.o sesh.o solaris.o:;
-    $makefile =~ s:\@SUDOERS_OBJS\@:bsm_audit.lo linux_audit.lo ldap.lo ldap_common.lo ldap_conf.lo solaris_audit.lo sssd.lo:;
+    $makefile =~ s:\@SUDOERS_OBJS\@:bsm_audit.lo linux_audit.lo ldap.lo ldap_util.lo ldap_conf.lo solaris_audit.lo sssd.lo:;
     # XXX - fill in AUTH_OBJS from contents of the auth dir instead
     $makefile =~ s:\@AUTH_OBJS\@:afs.lo aix_auth.lo bsdauth.lo dce.lo fwtk.lo getspwuid.lo kerb5.lo pam.lo passwd.lo rfc1938.lo secureware.lo securid5.lo sia.lo:;
     $makefile =~ s:\@FILEDIGEST\@:filedigest.lo filedigest_openssl.lo filedigest_gcrypt.lo:;

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 33dd2dcc3af4745a22a0e288e8d0cec97a095abb..3a225c18ebfe1a307dcdd56c74a4d6949f67318b 100644 (file)
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -163,7 +163,7 @@ SUDOERS_OBJS = $(AUTH_OBJS) boottime.lo check.lo editor.lo env.lo \
 VISUDO_OBJS = editor.o find_path.o goodpath.o locale.o stubs.o sudo_printf.o visudo.o
 
 CVTSUDOERS_OBJS = cvtsudoers.o cvtsudoers_json.o cvtsudoers_ldif.o \
-                 fmtsudoers.o locale.o stubs.o sudo_printf.o ldap_common.o
+                 fmtsudoers.o locale.o stubs.o sudo_printf.o ldap_util.o
 
 REPLAY_OBJS = getdate.o sudoreplay.o
 
@@ -979,19 +979,6 @@ ldap.lo: $(srcdir)/ldap.c $(devdir)/def_data.h $(devdir)/gram.h \
          $(srcdir)/sudoers.h $(srcdir)/sudoers_debug.h \
          $(top_builddir)/config.h $(top_builddir)/pathnames.h
        $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/ldap.c
-ldap_common.lo: $(srcdir)/ldap_common.c $(devdir)/def_data.h $(devdir)/gram.h \
-                $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
-                $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \
-                $(incdir)/sudo_fatal.h $(incdir)/sudo_gettext.h \
-                $(incdir)/sudo_lbuf.h $(incdir)/sudo_plugin.h \
-                $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \
-                $(srcdir)/defaults.h $(srcdir)/interfaces.h \
-                $(srcdir)/logging.h $(srcdir)/parse.h $(srcdir)/sudo_ldap.h \
-                $(srcdir)/sudo_nss.h $(srcdir)/sudoers.h \
-                $(srcdir)/sudoers_debug.h $(top_builddir)/config.h \
-                $(top_builddir)/pathnames.h
-       $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/ldap_common.c
-ldap_common.o: ldap_common.lo
 ldap_conf.lo: $(srcdir)/ldap_conf.c $(devdir)/def_data.h \
               $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
               $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \
@@ -1004,6 +991,18 @@ ldap_conf.lo: $(srcdir)/ldap_conf.c $(devdir)/def_data.h \
               $(srcdir)/sudoers_debug.h $(top_builddir)/config.h \
               $(top_builddir)/pathnames.h
        $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/ldap_conf.c
+ldap_util.lo: $(srcdir)/ldap_util.c $(devdir)/def_data.h $(devdir)/gram.h \
+              $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
+              $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \
+              $(incdir)/sudo_fatal.h $(incdir)/sudo_gettext.h \
+              $(incdir)/sudo_lbuf.h $(incdir)/sudo_plugin.h \
+              $(incdir)/sudo_queue.h $(incdir)/sudo_util.h \
+              $(srcdir)/defaults.h $(srcdir)/interfaces.h $(srcdir)/logging.h \
+              $(srcdir)/parse.h $(srcdir)/sudo_ldap.h $(srcdir)/sudo_nss.h \
+              $(srcdir)/sudoers.h $(srcdir)/sudoers_debug.h \
+              $(top_builddir)/config.h $(top_builddir)/pathnames.h
+       $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(ASAN_CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(srcdir)/ldap_util.c
+ldap_util.o: ldap_util.lo
 linux_audit.lo: $(srcdir)/linux_audit.c $(devdir)/def_data.h \
                 $(incdir)/compat/stdbool.h $(incdir)/sudo_compat.h \
                 $(incdir)/sudo_conf.h $(incdir)/sudo_debug.h \

diff --git a/plugins/sudoers/ldap_common.c b/plugins/sudoers/ldap_util.c
similarity index 100%
rename from plugins/sudoers/ldap_common.c
rename to plugins/sudoers/ldap_util.c