summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorMartin Nagy <mnagy@redhat.com>2009-10-08 21:18:30 +0200
committerStephen Gallagher <sgallagh@redhat.com>2009-10-22 13:56:22 -0400
commitdc35d48c98e78116a8393f6fa432d38c2622c02b (patch)
tree8de8695817b703b349c322cfb9a59151e50f6d05 /server
parentaf40ddb7f307b84dc7f983fd420475809bda0851 (diff)
downloadsssd-dc35d48c98e78116a8393f6fa432d38c2622c02b.tar.gz
sssd-dc35d48c98e78116a8393f6fa432d38c2622c02b.tar.xz
sssd-dc35d48c98e78116a8393f6fa432d38c2622c02b.zip
Delete sssd-i18n.h and put it's old contents into util.h
Also include talloc.h, tevent.h and ldb.h as system headers in util.h.
Diffstat (limited to 'server')
-rw-r--r--server/Makefile.am1
-rw-r--r--server/monitor/monitor.c1
-rw-r--r--server/tools/sss_useradd.c1
-rw-r--r--server/tools/tools_util.h2
-rw-r--r--server/util/server.c1
-rw-r--r--server/util/sssd-i18n.h29
-rw-r--r--server/util/util.h12
7 files changed, 10 insertions, 37 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 564d4f16b..e48c44f1e 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -236,7 +236,6 @@ dist_noinst_HEADERS = \
monitor/monitor.h \
util/nss_sha512crypt.h \
util/dlinklist.h \
- util/sssd-i18n.h \
util/util.h \
util/strtonum.h \
util/sss_ldap.h \
diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c
index 427e10d19..56bf6eaae 100644
--- a/server/monitor/monitor.c
+++ b/server/monitor/monitor.c
@@ -52,7 +52,6 @@
#include "dbus/dbus.h"
#include "sbus/sssd_dbus.h"
#include "monitor/monitor_interfaces.h"
-#include "util/sssd-i18n.h"
/* ping time cannot be less then once every few seconds or the
* monitor will get crazy hammering children with messages */
diff --git a/server/tools/sss_useradd.c b/server/tools/sss_useradd.c
index f805b242e..d05f5ae94 100644
--- a/server/tools/sss_useradd.c
+++ b/server/tools/sss_useradd.c
@@ -31,7 +31,6 @@
#include "db/sysdb.h"
#include "tools/tools_util.h"
#include "tools/sss_sync_ops.h"
-#include "util/sssd-i18n.h"
/* Default settings for user attributes */
#define CONFDB_DFL_SECTION "config/user_defaults"
diff --git a/server/tools/tools_util.h b/server/tools/tools_util.h
index a56fc5eb7..92fba20d0 100644
--- a/server/tools/tools_util.h
+++ b/server/tools/tools_util.h
@@ -25,7 +25,7 @@
#include <popt.h>
-#include "util/sssd-i18n.h"
+#include "util/util.h"
#define CHECK_ROOT(val, prg_name) do { \
val = getuid(); \
diff --git a/server/util/server.c b/server/util/server.c
index e8daf87cb..3a84c70d7 100644
--- a/server/util/server.c
+++ b/server/util/server.c
@@ -29,7 +29,6 @@
#include <fcntl.h>
#include <unistd.h>
#include "util/util.h"
-#include "util/sssd-i18n.h"
#include "ldb.h"
#include "confdb/confdb.h"
diff --git a/server/util/sssd-i18n.h b/server/util/sssd-i18n.h
deleted file mode 100644
index 73b1c80b3..000000000
--- a/server/util/sssd-i18n.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- Authors:
- Stephen Gallagher <sgallagh@redhat.com>
-
- Copyright (C) 2009 Red Hat
-
- 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/>.
-*/
-
-#ifndef _SSSD_I18N_H
-#define _SSSD_I18N_H
-
-#include <locale.h>
-#include <libintl.h>
-#define _(STRING) gettext (STRING)
-#include "config.h"
-
-#endif
diff --git a/server/util/util.h b/server/util/util.h
index a9d255328..9a27ae559 100644
--- a/server/util/util.h
+++ b/server/util/util.h
@@ -27,19 +27,25 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
+#include <libintl.h>
#include <limits.h>
+#include <locale.h>
#include <time.h>
#include <pcre.h>
+
#include "config.h"
-#include "talloc.h"
-#include "tevent.h"
-#include "ldb.h"
+
+#include <talloc.h>
+#include <tevent.h>
+#include <ldb.h>
#ifndef HAVE_ERRNO_T
#define HAVE_ERRNO_T
typedef int errno_t;
#endif
+#define _(STRING) gettext (STRING)
+
extern const char *debug_prg_name;
extern int debug_level;
extern int debug_timestamps;