created responder/[common,nss,pam] and moved files

20 files changed, 51 insertions, 53 deletions

diff --git a/server/providers/data_provider.c b/server/providers/data_provider.c
index 7c6db596a..f38b97e2e 100644
--- a/server/providers/data_provider.c
+++ b/server/providers/data_provider.c
@@ -41,7 +41,7 @@
 #include "dp_interfaces.h"
 #include "monitor/monitor_sbus.h"
 #include "monitor/monitor_interfaces.h"
-#include "nss/pamsrv.h"
+#include "responder/pam/pamsrv.h"
 
 struct dp_backend;
 struct dp_frontend;
diff --git a/server/providers/dp_backend.h b/server/providers/dp_backend.h
index 9da409b91..8fa73c7f0 100644
--- a/server/providers/dp_backend.h
+++ b/server/providers/dp_backend.h
@@ -24,7 +24,7 @@
 
 #include "providers/data_provider.h"
 #include "db/sysdb.h"
-#include "nss/pamsrv.h"
+#include "responder/pam/pamsrv.h"
 
 struct be_mod_ops;
 
diff --git a/server/util/ssssrv_cmd.c b/server/responder/common/responder_cmd.c
index baf97001f..83d55e651 100644
--- a/server/util/ssssrv_cmd.c
+++ b/server/responder/common/responder_cmd.c
@@ -20,8 +20,8 @@
 */
 #include <errno.h>
 #include "util/util.h"
-#include "util/ssssrv_cmd.h"
-#include "util/ssssrv_packet.h"
+#include "responder/common/responder_cmd.h"
+#include "responder/common/responder_packet.h"
 
 
 void sss_cmd_done(struct sss_cmd_ctx *nctx)
diff --git a/server/util/ssssrv_cmd.h b/server/responder/common/responder_cmd.h
index ee094ad3b..ee094ad3b 100644
--- a/server/util/ssssrv_cmd.h
+++ b/server/responder/common/responder_cmd.h
diff --git a/server/util/ssssrv_common.c b/server/responder/common/responder_common.c
index 6c45ea6ae..98d24cb58 100644
--- a/server/util/ssssrv_common.c
+++ b/server/responder/common/responder_common.c
@@ -31,15 +31,15 @@
 #include <errno.h>
 #include "popt.h"
 #include "util/util.h"
-#include "nss/nsssrv.h"
+#include "responder/nss/nsssrv.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "util/btreemap.h"
-#include "util/ssssrv_packet.h"
-#include "util/ssssrv_cmd.h"
-#include "util/ssssrv_dp.h"
+#include "responder/common/responder_packet.h"
+#include "responder/common/responder_cmd.h"
+#include "responder/common/responder_dp.h"
 #include "providers/data_provider.h"
 #include "monitor/monitor_sbus.h"
 #include "monitor/monitor_interfaces.h"
diff --git a/server/util/ssssrv_common.h b/server/responder/common/responder_common.h
index 0f9b7c8be..433b242e2 100644
--- a/server/util/ssssrv_common.h
+++ b/server/responder/common/responder_common.h
@@ -1,5 +1,5 @@
 #include "sbus/sssd_dbus.h"
-#include "util/ssssrv_cmd.h"
+#include "responder/common/responder_cmd.h"
 #include "util/btreemap.h"
 
 /* SSS_DOMAIN_DELIM can be specified in config.h */
diff --git a/server/util/ssssrv_dp.c b/server/responder/common/responder_dp.c
index f5396d847..a024674b3 100644
--- a/server/util/ssssrv_dp.c
+++ b/server/responder/common/responder_dp.c
@@ -1,10 +1,10 @@
 
 #include <sys/time.h>
 #include <time.h>
-#include "nss/nsssrv.h"
+#include "responder/nss/nsssrv.h"
 #include "util/util.h"
-#include "util/ssssrv_packet.h"
-#include "util/ssssrv_common.h"
+#include "responder/common/responder_packet.h"
+#include "responder/common/responder_common.h"
 #include "providers/data_provider.h"
 #include "sbus/sbus_client.h"
 #include "providers/dp_sbus.h"
diff --git a/server/util/ssssrv_dp.h b/server/responder/common/responder_dp.h
index 4d1b3c4b8..2eeddf5b0 100644
--- a/server/util/ssssrv_dp.h
+++ b/server/responder/common/responder_dp.h
@@ -1,4 +1,4 @@
-#include "nss/nsssrv.h"
+#include "responder/nss/nsssrv.h"
 #include "sbus/sssd_dbus.h"
 
 int sss_dp_init(struct nss_ctx *nctx, struct sbus_method dp_methods[]);
diff --git a/server/util/ssssrv_packet.c b/server/responder/common/responder_packet.c
index efc5ce133..247629342 100644
--- a/server/util/ssssrv_packet.c
+++ b/server/responder/common/responder_packet.c
@@ -24,8 +24,8 @@
 #include <string.h>
 #include <errno.h>
 #include "talloc.h"
-#include "../util/util.h"
-#include "ssssrv_packet.h"
+#include "util/util.h"
+#include "responder/common/responder_packet.h"
 
 #define SSSSRV_PACKET_MEM_SIZE 512
 
diff --git a/server/util/ssssrv_packet.h b/server/responder/common/responder_packet.h
index 1a8529466..1a8529466 100644
--- a/server/util/ssssrv_packet.h
+++ b/server/responder/common/responder_packet.h
diff --git a/server/nss/nsssrv.c b/server/responder/nss/nsssrv.c
index e0cf3e5e5..7d20e8d18 100644
--- a/server/nss/nsssrv.c
+++ b/server/responder/nss/nsssrv.c
@@ -31,13 +31,13 @@
 #include <errno.h>
 #include "popt.h"
 #include "util/util.h"
-#include "nss/nsssrv.h"
+#include "responder/nss/nsssrv.h"
 #include "db/sysdb.h"
 #include "confdb/confdb.h"
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "util/btreemap.h"
-#include "util/ssssrv_packet.h"
+#include "responder/common/responder_packet.h"
 #include "providers/data_provider.h"
 #include "monitor/monitor_sbus.h"
 #include "monitor/monitor_interfaces.h"
diff --git a/server/nss/nsssrv.h b/server/responder/nss/nsssrv.h
index 09d078160..03dc35af2 100644
--- a/server/nss/nsssrv.h
+++ b/server/responder/nss/nsssrv.h
@@ -30,7 +30,7 @@
 #include "../sss_client/sss_cli.h"
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
-#include "util/ssssrv_cmd.h"
+#include "responder/common/responder_cmd.h"
 
 #define NSS_SBUS_SERVICE_VERSION 0x0001
 #define NSS_SBUS_SERVICE_NAME "nss"
diff --git a/server/nss/nsssrv_cmd.c b/server/responder/nss/nsssrv_cmd.c
index 7018dd4dd..74b11bb74 100644
--- a/server/nss/nsssrv_cmd.c
+++ b/server/responder/nss/nsssrv_cmd.c
@@ -21,8 +21,8 @@
 
 #include "util/util.h"
 #include "util/btreemap.h"
-#include "util/ssssrv_packet.h"
-#include "nss/nsssrv.h"
+#include "responder/common/responder_packet.h"
+#include "responder/nss/nsssrv.h"
 #include "db/sysdb.h"
 #include <time.h>
 
diff --git a/server/nss/nsssrv_dp.c b/server/responder/nss/nsssrv_dp.c
index 2a712dd60..8a4efe7e5 100644
--- a/server/nss/nsssrv_dp.c
+++ b/server/responder/nss/nsssrv_dp.c
@@ -22,8 +22,8 @@
 #include <sys/time.h>
 #include <time.h>
 #include "util/util.h"
-#include "util/ssssrv_packet.h"
-#include "nss/nsssrv.h"
+#include "responder/common/responder_packet.h"
+#include "responder/nss/nsssrv.h"
 #include "providers/data_provider.h"
 #include "sbus/sbus_client.h"
 #include "providers/dp_sbus.h"
diff --git a/server/nss/pamsrv.c b/server/responder/pam/pamsrv.c
index 7000c56fd..bcdf2ee1b 100644
--- a/server/nss/pamsrv.c
+++ b/server/responder/pam/pamsrv.c
@@ -36,14 +36,14 @@
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "util/btreemap.h"
-#include "util/ssssrv_packet.h"
-#include "util/ssssrv_cmd.h"
-#include "util/ssssrv_common.h"
+#include "responder/common/responder_packet.h"
+#include "responder/common/responder_cmd.h"
+#include "responder/common/responder_common.h"
 #include "providers/data_provider.h"
 #include "monitor/monitor_sbus.h"
 #include "monitor/monitor_interfaces.h"
 #include "sbus/sbus_client.h"
-#include "nss/pamsrv.h"
+#include "responder/pam/pamsrv.h"
 
 #define SSS_PAM_PIPE_NAME "pam"
 #define PAM_SBUS_SERVICE_VERSION 0x0001
diff --git a/server/nss/pamsrv.h b/server/responder/pam/pamsrv.h
index 4f65974c1..bb0082acc 100644
--- a/server/nss/pamsrv.h
+++ b/server/responder/pam/pamsrv.h
@@ -1,5 +1,5 @@
 #include "sbus/sssd_dbus.h"
-#include "util/ssssrv_cmd.h"
+#include "responder/common/responder_cmd.h"
 
 #define PAM_DP_TIMEOUT 5000
 
diff --git a/server/nss/pamsrv_cmd.c b/server/responder/pam/pamsrv_cmd.c
index 23b9d4e78..0f9546cff 100644
--- a/server/nss/pamsrv_cmd.c
+++ b/server/responder/pam/pamsrv_cmd.c
@@ -2,10 +2,10 @@
 #include <talloc.h>
 
 #include "util/util.h"
-#include "util/ssssrv_common.h"
-#include "util/ssssrv_cmd.h"
-#include "util/ssssrv_packet.h"
-#include "nss/pamsrv.h"
+#include "responder/common/responder_common.h"
+#include "responder/common/responder_cmd.h"
+#include "responder/common/responder_packet.h"
+#include "responder/pam/pamsrv.h"
 
 static int pam_parse_in_data(uint8_t *body, size_t blen, struct pam_data *pd) {
     int start;
diff --git a/server/nss/pamsrv_dp.c b/server/responder/pam/pamsrv_dp.c
index 7924c5624..d8ebb1449 100644
--- a/server/nss/pamsrv_dp.c
+++ b/server/responder/pam/pamsrv_dp.c
@@ -25,12 +25,12 @@
 #include <talloc.h>
 
 #include "util/util.h"
-#include "util/ssssrv_packet.h"
-#include "nss/nsssrv.h"
+#include "responder/common/responder_packet.h"
+#include "responder/nss/nsssrv.h"
 #include "providers/data_provider.h"
 #include "sbus/sbus_client.h"
 #include "providers/dp_sbus.h"
-#include "nss/pamsrv.h"
+#include "responder/pam/pamsrv.h"
 
 struct pam_reply_ctx {
     struct cli_ctx *cctx;
diff --git a/server/nss/pamsrv_util.c b/server/responder/pam/pamsrv_util.c
index f164d1b0c..5dab9b679 100644
--- a/server/nss/pamsrv_util.c
+++ b/server/responder/pam/pamsrv_util.c
@@ -1,9 +1,7 @@
 #include "util/util.h"
-#include "nss/pamsrv.h"
+#include "responder/pam/pamsrv.h"
 
 void pam_print_data(int l, struct pam_data *pd) {
-    int i;
-
     DEBUG(l, ("command: %d\n", pd->cmd));
     DEBUG(l, ("domain: %s\n", pd->domain));
     DEBUG(l, ("user: %s\n", pd->user));
diff --git a/server/server.mk b/server/server.mk
index aada69cfc..f22bcf4fe 100644
--- a/server/server.mk
+++ b/server/server.mk
@@ -14,11 +14,11 @@ UTIL_OBJ = \
 	db/sysdb.o \
 	db/sysdb_sync.o
 
-SSSSERV_UTIL_OBJ = \
-    util/ssssrv_dp.o \
-    util/ssssrv_packet.o \
-    util/ssssrv_common.o \
-    util/ssssrv_cmd.o
+RESPONDER_UTIL_OBJ = \
+    responder/common/responder_dp.o \
+    responder/common/responder_packet.o \
+    responder/common/responder_common.o \
+    responder/common/responder_cmd.o
 
 SERVER_OBJ = \
     monitor/monitor.o
@@ -36,9 +36,9 @@ LDAP_BE_OBJ = \
 	providers/ldap_be.o
 
 NSSSRV_OBJ = \
-    nss/nsssrv.o \
-    nss/nsssrv_cmd.o \
-    nss/nsssrv_dp.o
+    responder/nss/nsssrv.o \
+    responder/nss/nsssrv_cmd.o \
+    responder/nss/nsssrv_dp.o
 
 INFOPIPE_OBJ = \
     infopipe/infopipe.o \
@@ -56,22 +56,22 @@ SYSDB_TEST_OBJ = \
 	tests/sysdb-tests.o
 
 PAMSRV_OBJ = \
-    nss/pamsrv.o \
-    nss/pamsrv_cmd.o \
-    nss/pamsrv_dp.o
+    responder/pam/pamsrv.o \
+    responder/pam/pamsrv_cmd.o \
+    responder/pam/pamsrv_dp.o
 
-PAMSRV_UTIL_OBJ = nss/pamsrv_util.o
+PAMSRV_UTIL_OBJ = responder/pam/pamsrv_util.o
 
 PAM = -lpam
 
 sbin/sssd: $(SERVER_OBJ) $(UTIL_OBJ)
 	$(CC) -o sbin/sssd $(SERVER_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS)
 
-sbin/sssd_nss: $(NSSSRV_OBJ) $(UTIL_OBJ)
-	$(CC) -o sbin/sssd_nss $(NSSSRV_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS)
+sbin/sssd_nss: $(NSSSRV_OBJ) $(UTIL_OBJ) $(RESPONDER_UTIL_OBJ)
+	$(CC) -o sbin/sssd_nss $(NSSSRV_OBJ) $(UTIL_OBJ) $(RESPONDER_UTIL_OBJ) -lsysdb $(LDFLAGS) $(LIBS)
 
-sbin/sssd_pam: $(PAMSRV_OBJ) $(UTIL_OBJ) $(SSSSERV_UTIL_OBJ) $(PAMSRV_UTIL_OBJ)
-	$(CC) -o sbin/sssd_pam $(PAMSRV_OBJ) $(UTIL_OBJ) $(PAMSRV_UTIL_OBJ) $(SSSSERV_UTIL_OBJ) -lsysdb $(LDFLAGS) $(LIBS)
+sbin/sssd_pam: $(PAMSRV_OBJ) $(UTIL_OBJ) $(RESPONDER_UTIL_OBJ) $(PAMSRV_UTIL_OBJ)
+	$(CC) -o sbin/sssd_pam $(PAMSRV_OBJ) $(UTIL_OBJ) $(PAMSRV_UTIL_OBJ) $(RESPONDER_UTIL_OBJ) $(LDFLAGS) $(LIBS)
 
 sbin/sssd_dp: $(DP_OBJ) $(UTIL_OBJ) $(PAMSRV_UTIL_OBJ)
 	$(CC) -o sbin/sssd_dp $(DP_OBJ) $(UTIL_OBJ) $(PAMSRV_UTIL_OBJ) $(LDFLAGS) $(LIBS)