summaryrefslogtreecommitdiff
path: root/modules/pam_mkhomedir
diff options
context:
space:
mode:
authorTomas Mraz <tm@t8m.info>2005-09-21 10:00:58 +0000
committerTomas Mraz <tm@t8m.info>2005-09-21 10:00:58 +0000
commitbe09d6354efcb2571731bdffc47da86f22621ac8 (patch)
tree82117bfbaadb46495a545ba4f567dc9bddd97c33 /modules/pam_mkhomedir
parent627a0401899af257f0fb711ad54194e14a75c530 (diff)
Relevant BUGIDs:
Purpose of commit: new feature Commit summary: --------------- Moved functions from pammodutil to libpam.
Diffstat (limited to 'modules/pam_mkhomedir')
-rw-r--r--modules/pam_mkhomedir/Makefile.am4
-rw-r--r--modules/pam_mkhomedir/pam_mkhomedir.c12
2 files changed, 7 insertions, 9 deletions
diff --git a/modules/pam_mkhomedir/Makefile.am b/modules/pam_mkhomedir/Makefile.am
index c955404e..641a5618 100644
--- a/modules/pam_mkhomedir/Makefile.am
+++ b/modules/pam_mkhomedir/Makefile.am
@@ -9,10 +9,8 @@ EXTRA_DIST = README
securelibdir = $(SECUREDIR)
secureconfdir = $(SCONFIGDIR)
-AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \
- -I$(top_srcdir)/modules/pammodutil/include/
+AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
AM_LDFLAGS = -no-undefined -avoid-version -module \
- $(top_builddir)/modules/pammodutil/libpammodutil.la \
-L$(top_builddir)/libpam -lpam
if HAVE_VERSIONING
AM_LDFLAGS += -Wl,--version-script=../modules.map
diff --git a/modules/pam_mkhomedir/pam_mkhomedir.c b/modules/pam_mkhomedir/pam_mkhomedir.c
index 8cc20667..de67c0cc 100644
--- a/modules/pam_mkhomedir/pam_mkhomedir.c
+++ b/modules/pam_mkhomedir/pam_mkhomedir.c
@@ -53,7 +53,7 @@
#include <security/pam_modules.h>
#include <security/_pam_macros.h>
-#include <security/_pam_modutil.h>
+#include <security/pam_modutil.h>
#include <security/pam_ext.h>
@@ -400,18 +400,18 @@ create_homedir (pam_handle_t * pamh, int ctrl,
/* Copy the file */
do
{
- Res = _pammodutil_read(SrcFd,remark,sizeof(remark));
+ Res = pam_modutil_read(SrcFd,remark,sizeof(remark));
if (Res == 0)
continue;
if (Res > 0) {
- if (_pammodutil_write(DestFd,remark,Res) == Res)
+ if (pam_modutil_write(DestFd,remark,Res) == Res)
continue;
}
- /* If we get here, pammodutil_read returned a -1 or
- _pammodutil_write returned something unexpected. */
+ /* If we get here, pam_modutil_read returned a -1 or
+ pam_modutil_write returned something unexpected. */
close(SrcFd);
close(DestFd);
closedir(D);
@@ -473,7 +473,7 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc,
}
/* Get the password entry */
- pwd = _pammodutil_getpwnam (pamh, user);
+ pwd = pam_modutil_getpwnam (pamh, user);
if (pwd == NULL)
{
D(("couldn't identify user %s", user));