[1/9] ksmbd-tools: rename dirs to reflect new commands

Commit Message

Enzo Matsumiya March 7, 2022, 1:33 a.m. UTC

Rename directories to reflect command names, in preparation for binary
unification.

Signed-off-by: Enzo Matsumiya <[e-mail]>
---
 Makefile.am                        | 2 +-
 configure.ac                       | 6 +++---
 {mountd => daemon}/Makefile.am     | 2 +-
 mountd/mountd.c => daemon/daemon.c | 0
 {mountd => daemon}/ipc.c           | 0
 {mountd => daemon}/rpc.c           | 0
 {mountd => daemon}/rpc_lsarpc.c    | 0
 {mountd => daemon}/rpc_samr.c      | 0
 {mountd => daemon}/rpc_srvsvc.c    | 0
 {mountd => daemon}/rpc_wkssvc.c    | 0
 {mountd => daemon}/smbacl.c        | 0
 {mountd => daemon}/worker.c        | 0
 {addshare => share}/Makefile.am    | 0
 {addshare => share}/addshare.c     | 0
 {addshare => share}/share_admin.c  | 0
 {addshare => share}/share_admin.h  | 0
 {adduser => user}/Makefile.am      | 0
 {adduser => user}/adduser.c        | 0
 {adduser => user}/md4_hash.c       | 0
 {adduser => user}/md4_hash.h       | 0
 {adduser => user}/user_admin.c     | 0
 {adduser => user}/user_admin.h     | 0
 22 files changed, 5 insertions(+), 5 deletions(-)
 rename {mountd => daemon}/Makefile.am (95%)
 rename mountd/mountd.c => daemon/daemon.c (100%)
 rename {mountd => daemon}/ipc.c (100%)
 rename {mountd => daemon}/rpc.c (100%)
 rename {mountd => daemon}/rpc_lsarpc.c (100%)
 rename {mountd => daemon}/rpc_samr.c (100%)
 rename {mountd => daemon}/rpc_srvsvc.c (100%)
 rename {mountd => daemon}/rpc_wkssvc.c (100%)
 rename {mountd => daemon}/smbacl.c (100%)
 rename {mountd => daemon}/worker.c (100%)
 rename {addshare => share}/Makefile.am (100%)
 rename {addshare => share}/addshare.c (100%)
 rename {addshare => share}/share_admin.c (100%)
 rename {addshare => share}/share_admin.h (100%)
 rename {adduser => user}/Makefile.am (100%)
 rename {adduser => user}/adduser.c (100%)
 rename {adduser => user}/md4_hash.c (100%)
 rename {adduser => user}/md4_hash.h (100%)
 rename {adduser => user}/user_admin.c (100%)
 rename {adduser => user}/user_admin.h (100%)

Patch

diff --git a/Makefile.am b/Makefile.am
index 00a6148ff29d..e3ee928691bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ 
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib mountd adduser addshare control
+SUBDIRS = lib daemon user share control
 
 # other stuff
 EXTRA_DIST =			\
diff --git a/configure.ac b/configure.ac
index 6aceade6ed01..1f107805325f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,9 +62,9 @@  AM_CONDITIONAL(HAVE_LIBKRB5, [test "$enable_krb5" != "no"])
 AC_CONFIG_FILES([
 	Makefile
 	lib/Makefile
-	mountd/Makefile
-	adduser/Makefile
-	addshare/Makefile
+	daemon/Makefile
+	user/Makefile
+	share/Makefile
 	control/Makefile
 ])
 
diff --git a/mountd/Makefile.am b/daemon/Makefile.am
similarity index 95%
rename from mountd/Makefile.am
rename to daemon/Makefile.am
index 4719170f2d05..6249a098025d 100644
--- a/mountd/Makefile.am
+++ b/daemon/Makefile.am
@@ -4,5 +4,5 @@  ksmbd_mountd_LDADD = $(top_builddir)/lib/libksmbdtools.a
 
 sbin_PROGRAMS = ksmbd.mountd
 
-ksmbd_mountd_SOURCES = worker.c ipc.c rpc.c rpc_srvsvc.c rpc_wkssvc.c mountd.c \
+ksmbd_mountd_SOURCES = worker.c ipc.c rpc.c rpc_srvsvc.c rpc_wkssvc.c daemon.c \
 		       smbacl.c rpc_samr.c rpc_lsarpc.c
diff --git a/mountd/mountd.c b/daemon/daemon.c
similarity index 100%
rename from mountd/mountd.c
rename to daemon/daemon.c
diff --git a/mountd/ipc.c b/daemon/ipc.c
similarity index 100%
rename from mountd/ipc.c
rename to daemon/ipc.c
diff --git a/mountd/rpc.c b/daemon/rpc.c
similarity index 100%
rename from mountd/rpc.c
rename to daemon/rpc.c
diff --git a/mountd/rpc_lsarpc.c b/daemon/rpc_lsarpc.c
similarity index 100%
rename from mountd/rpc_lsarpc.c
rename to daemon/rpc_lsarpc.c
diff --git a/mountd/rpc_samr.c b/daemon/rpc_samr.c
similarity index 100%
rename from mountd/rpc_samr.c
rename to daemon/rpc_samr.c
diff --git a/mountd/rpc_srvsvc.c b/daemon/rpc_srvsvc.c
similarity index 100%
rename from mountd/rpc_srvsvc.c
rename to daemon/rpc_srvsvc.c
diff --git a/mountd/rpc_wkssvc.c b/daemon/rpc_wkssvc.c
similarity index 100%
rename from mountd/rpc_wkssvc.c
rename to daemon/rpc_wkssvc.c
diff --git a/mountd/smbacl.c b/daemon/smbacl.c
similarity index 100%
rename from mountd/smbacl.c
rename to daemon/smbacl.c
diff --git a/mountd/worker.c b/daemon/worker.c
similarity index 100%
rename from mountd/worker.c
rename to daemon/worker.c
diff --git a/addshare/Makefile.am b/share/Makefile.am
similarity index 100%
rename from addshare/Makefile.am
rename to share/Makefile.am
diff --git a/addshare/addshare.c b/share/addshare.c
similarity index 100%
rename from addshare/addshare.c
rename to share/addshare.c
diff --git a/addshare/share_admin.c b/share/share_admin.c
similarity index 100%
rename from addshare/share_admin.c
rename to share/share_admin.c
diff --git a/addshare/share_admin.h b/share/share_admin.h
similarity index 100%
rename from addshare/share_admin.h
rename to share/share_admin.h
diff --git a/adduser/Makefile.am b/user/Makefile.am
similarity index 100%
rename from adduser/Makefile.am
rename to user/Makefile.am
diff --git a/adduser/adduser.c b/user/adduser.c
similarity index 100%
rename from adduser/adduser.c
rename to user/adduser.c
diff --git a/adduser/md4_hash.c b/user/md4_hash.c
similarity index 100%
rename from adduser/md4_hash.c
rename to user/md4_hash.c
diff --git a/adduser/md4_hash.h b/user/md4_hash.h
similarity index 100%
rename from adduser/md4_hash.h
rename to user/md4_hash.h
diff --git a/adduser/user_admin.c b/user/user_admin.c
similarity index 100%
rename from adduser/user_admin.c
rename to user/user_admin.c
diff --git a/adduser/user_admin.h b/user/user_admin.h
similarity index 100%
rename from adduser/user_admin.h
rename to user/user_admin.h