summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorKarel Klic <kklic@redhat.com>2009-11-30 16:43:13 +0100
committerKarel Klic <kklic@redhat.com>2009-11-30 16:43:13 +0100
commit49c4d359ff6d5332f60c090ad2c26a9a39086014 (patch)
tree7f8ff0bd74fc842b5578d27399511aa6c2ec6d58 /lib
parent277c2b79dd8d4bfa9eac979bcb51dc050ff1627b (diff)
parentccffe86678210568449c6a6345ae5d6dc20ef104 (diff)
downloadabrt-49c4d359ff6d5332f60c090ad2c26a9a39086014.tar.gz
abrt-49c4d359ff6d5332f60c090ad2c26a9a39086014.tar.xz
abrt-49c4d359ff6d5332f60c090ad2c26a9a39086014.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'lib')
-rw-r--r--lib/Plugins/Makefile.am4
-rw-r--r--lib/Utils/xfuncs.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am
index 97da2204..58f1334d 100644
--- a/lib/Plugins/Makefile.am
+++ b/lib/Plugins/Makefile.am
@@ -52,7 +52,7 @@ libCCpp_la_SOURCES = CCpp.cpp CCpp.h
libCCpp_la_LDFLAGS = -avoid-version
libCCpp_la_LIBADD = $(NSS_LIBS)
libCCpp_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils \
- -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\" \
+ -DCCPP_HOOK_PATH=\"${libexecdir}/abrt-hook-ccpp\" \
-DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-DLOCALSTATEDIR='"$(localstatedir)"' \
$(NSS_CFLAGS)
@@ -63,7 +63,7 @@ libCCpp_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils \
#libFirefox_la_LDFLAGS = -avoid-version
#libFirefox_la_LIBADD = $(NSS_LIBS)
#libFirefox_la_CPPFLAGS = -I$(srcdir)/../../inc -I$(srcdir)/../Utils \
-# -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\" \
+# -DCCPP_HOOK_PATH=\"${libexecdir}/abrt-hook-ccpp\" \
# -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
# -DLOCALSTATEDIR='"$(localstatedir)"' \
# $(NSS_CFLAGS)
diff --git a/lib/Utils/xfuncs.cpp b/lib/Utils/xfuncs.cpp
index 4b208a9e..c4b6dd6b 100644
--- a/lib/Utils/xfuncs.cpp
+++ b/lib/Utils/xfuncs.cpp
@@ -369,7 +369,7 @@ bool string_to_bool(const char *s)
return false;
}
-bool xgetpwnam(const char* login, uid_t *uid)
+bool getuidbyname(const char* login, uid_t *uid)
{
struct passwd* pwd = getpwnam(login);
if (pwd == NULL)