aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeraphim Mellos <mellos@ceid.upatras.gr>2008-08-01 16:25:12 +0300
committerSeraphim Mellos <mellos@ceid.upatras.gr>2008-08-01 16:25:12 +0300
commit3ac465ffc09dd2c7515afe2e329e017ac6962adc (patch)
treec35e015f13babdee53fda02cc371a4c896a9f5db /modules
parentMakefile corrections (diff)
downloadopenpam-modules-3ac465ffc09dd2c7515afe2e329e017ac6962adc.tar.gz
openpam-modules-3ac465ffc09dd2c7515afe2e329e017ac6962adc.tar.bz2
openpam-modules-3ac465ffc09dd2c7515afe2e329e017ac6962adc.zip
Minor fixes here and there
Diffstat (limited to 'modules')
-rw-r--r--modules/Makefile2
-rw-r--r--modules/pam_unix/md5.h4
-rw-r--r--modules/pam_unix/pam_unix.c15
-rw-r--r--modules/pam_wheel/pam_wheel.obin11504 -> 0 bytes
-rwxr-xr-xmodules/pam_wheel/pam_wheel.sobin12477 -> 0 bytes
5 files changed, 3 insertions, 18 deletions
diff --git a/modules/Makefile b/modules/Makefile
index d985659..e09247c 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -3,7 +3,7 @@ all install clean:
$(MAKE) -C pam_securetty $@
$(MAKE) -C pam_nologin $@
$(MAKE) -C pam_shells $@
-# $(MAKE) -C pam_wheel $@
+ $(MAKE) -C pam_wheel $@
$(MAKE) -C pam_rootok $@
$(MAKE) -C pam_permit $@
$(MAKE) -C pam_deny $@
diff --git a/modules/pam_unix/md5.h b/modules/pam_unix/md5.h
index ab381e8..df431b6 100644
--- a/modules/pam_unix/md5.h
+++ b/modules/pam_unix/md5.h
@@ -24,7 +24,6 @@ typedef struct MD5Context {
} MD5_CTX;
-__BEGIN_DECLS
void MD5Init(MD5_CTX *);
void MD5Update(MD5_CTX *, const u_int8_t *, size_t);
void MD5Pad(MD5_CTX *);
@@ -34,6 +33,5 @@ char *MD5End(MD5_CTX *, char *);
char *MD5File(const char *, char *);
char *MD5FileChunk(const char *, char *, off_t, off_t);
char *MD5Data(const u_int8_t *, size_t, char *);
-__END_DECLS
-
+char *MD5String(const char *);
#endif /* _MD5_H_ */
diff --git a/modules/pam_unix/pam_unix.c b/modules/pam_unix/pam_unix.c
index b750712..e7c058b 100644
--- a/modules/pam_unix/pam_unix.c
+++ b/modules/pam_unix/pam_unix.c
@@ -18,8 +18,6 @@
#define PAM_SM_PASSWORD
#define PAM_SM_SESSION
-
-
#define PASSWORD_HASH "md5"
#define MAX_RETRIES 3
#define DEFAULT_WARN (2L * 7L * 86400L) /* two weeks */
@@ -32,7 +30,7 @@
#include <security/pam_mod_misc.h>
-extern char * MD5String (char *) ;
+
/*
* Helper functions for internal use
*/
@@ -53,7 +51,6 @@ void makesalt(char salt[SALTSIZE]);
PAM_EXTERN int
pam_sm_authenticate(pam_handle_t *pamh, int flags,
int argc , const char *argv[] ) {
- puts("AUTH");
struct passwd *pwd;
const char *pass, *crypt_pass, *real_hash, *user;
int pam_err;
@@ -129,7 +126,6 @@ pam_sm_setcred(pam_handle_t *pamh , int flags ,
* will be completed. For now, it's not very urgent.
*/
- puts("SETCRED!");
return (PAM_SUCCESS);
}
@@ -142,7 +138,6 @@ PAM_EXTERN int
pam_sm_acct_mgmt(pam_handle_t *pamh, int flags ,
int argc , const char *argv[] ) {
- puts("ACCT_MGMT");
struct spwd *pwd;
int pam_err;
const char *user;
@@ -223,7 +218,6 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
int argc, const char *argv[])
{
- puts("CHAUTHTOK");
fprintf(stdout, "flags :%d\n" , flags);
fprintf(stdout, "flags :0x%x\n" , flags);
/*
@@ -276,11 +270,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
- if ( flags & PAM_CHANGE_EXPIRED_AUTHTOK ) {
- puts("EXPIRED AUTHTOK!");
- }
if ( flags & PAM_PRELIM_CHECK ) {
- puts("CHAUTHTOK_PRELIM");
PAM_LOG("Doing preliminary actions.");
if (getuid() == 0 ) {
/* root doesn't need old passwd */
@@ -314,7 +304,6 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
return (PAM_PERM_DENIED);
} else if ( flags & PAM_UPDATE_AUTHTOK ) {
- puts("CHAUTHTOK_UPDATE");
PAM_LOG("Doing actual update.");
pam_err= pam_get_authtok(pamh, PAM_OLDAUTHTOK ,&old_pass, NULL);
@@ -382,7 +371,6 @@ PAM_EXTERN int
pam_sm_open_session( pam_handle_t * pamh, int flags,
int argc, const char * argv[])
{
- puts("OPEN_SESSION");
char *user, *service;
int pam_err;
@@ -409,7 +397,6 @@ PAM_EXTERN int
pam_sm_close_session( pam_handle_t * pamh, int flags,
int argc, const char * argv[])
{
- puts("CLOSE_SESSION");
char *user, *service;
int pam_err;
pam_err = pam_get_item(pamh, PAM_USER, (void *) &user);
diff --git a/modules/pam_wheel/pam_wheel.o b/modules/pam_wheel/pam_wheel.o
deleted file mode 100644
index a629c2f..0000000
--- a/modules/pam_wheel/pam_wheel.o
+++ /dev/null
Binary files differ
diff --git a/modules/pam_wheel/pam_wheel.so b/modules/pam_wheel/pam_wheel.so
deleted file mode 100755
index b59efe6..0000000
--- a/modules/pam_wheel/pam_wheel.so
+++ /dev/null
Binary files differ