sesman/verify_user.c

diff --git a/sesman/verify_user.c b/sesman/verify_user.c

index 5bd89c7..81ddc0a 100644

--- a/sesman/verify_user.c

+++ b/sesman/verify_user.c

@@ -76,7 +76,7 @@

         if (1 == auth_account_disabled(stp))

         {

-            log_message(&(g_cfg->log), LOG_LEVEL_INFO, "account %s is disabled", user);

+            log_message(LOG_LEVEL_INFO, "account %s is disabled", user);

             return 0;

         }

configure.ac

diff --git a/configure.ac b/configure.ac

index 6dd4052..d431513 100644

--- a/configure.ac

+++ b/configure.ac

@@ -69,6 +69,11 @@

   fi

 fi

+if test "x$enable_nopam" = "xyes"

+then

+  AC_DEFINE([USE_NOPAM],1,[Disable PAM])

+fi

+

 AS_IF( [test "x$enable_freerdp1" = "xyes"] , [PKG_CHECK_MODULES(FREERDP, freerdp >= 1.0.0)] )

 # checking for libjpeg

xrdp/Makefile.am

diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am

index b755bbe..25ab3ee 100644

--- a/xrdp/Makefile.am

+++ b/xrdp/Makefile.am

@@ -14,6 +14,7 @@

   $(EXTRA_DEFINES)

 INCLUDES = \

+  -I$(top_builddir) \

   -I$(top_srcdir)/common \

   -I$(top_srcdir)/libxrdp

xrdp/xrdp_mm.c

diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c

index 1f5acaa..008f191 100644

--- a/xrdp/xrdp_mm.c

+++ b/xrdp/xrdp_mm.c

@@ -17,11 +17,14 @@

  *

  * module manager

  */

+#include <config_ac.h>

 #define ACCESS

 #include "xrdp.h"

 #include "log.h"

 #ifdef ACCESS

+#ifndef USE_NOPAM

 #include "security/_pam_types.h"

+#endif

 #endif

 /*****************************************************************************/

@@ -1071,6 +1074,7 @@

 }

 #ifdef ACCESS

+#ifndef USE_NOPAM

 /*********************************************************************/

 /* return 0 on success */

 int access_control(char *username, char *password, char *srv)

@@ -1183,6 +1187,7 @@

     return rec;

 }

 #endif

+#endif

 /*****************************************************************************/

 /* This routine clears all states to make sure that our next login will be

@@ -1206,6 +1211,7 @@

     }

 }

 #ifdef ACCESS

+#ifndef USE_NOPAM

 const char *getPAMError(const int pamError)

 {      

     switch(pamError){

@@ -1333,6 +1339,7 @@

 }

 #endif

+#endif

 /*****************************************************************************/

 int APP_CC

 xrdp_mm_connect(struct xrdp_mm *self)

@@ -1351,10 +1358,12 @@

     char port[8];

     char chansrvport[256];

 #ifdef ACCESS

+#ifndef USE_NOPAM

     int use_pam_auth = 0;

     char pam_auth_sessionIP[256];

     char pam_auth_password[256];

     char pam_auth_username[256];

+#endif

     char username[256];

     char password[256];

     username[0] = 0;

@@ -1390,6 +1399,7 @@

         }

 #ifdef ACCESS

+#ifndef USE_NOPAM

         else if (g_strcasecmp(name, "pamusername") == 0)

         {

             use_pam_auth = 1;

@@ -1403,6 +1413,7 @@

         {

             g_strncpy(pam_auth_password, value, 255);

         }

+#endif

         else if (g_strcasecmp(name, "password") == 0)

         {

             g_strncpy(password, value, 255);

@@ -1421,7 +1432,7 @@

     }

 #ifdef ACCESS

-

+#ifndef USE_NOPAM

     if (use_pam_auth)

     {

         int reply;

@@ -1464,7 +1475,7 @@

             return rv;

         }

     }

-

+#endif

 #endif

     if (self->sesman_controlled)

sesman/verify_user.c

diff --git a/sesman/verify_user.c b/sesman/verify_user.c

index 81ddc0a..85e614d 100644

--- a/sesman/verify_user.c

+++ b/sesman/verify_user.c

@@ -50,12 +50,9 @@

 long DEFAULT_CC

 auth_userpass(char *user, char *pass, int *errorcode)

 {

-    char salt[13] = "$1$";

-    char hash[35] = "";

-    char *encr = 0;

+    const char *encr;

     struct passwd *spw;

     struct spwd *stp;

-    int saltcnt = 0;

     spw = getpwnam(user);

@@ -80,46 +77,15 @@

             return 0;

         }

-        g_strncpy(hash, stp->sp_pwdp, 34);

+        encr = stp->sp_pwdp;

     }

     else

     {

         /* old system with only passwd */

-        g_strncpy(hash, spw->pw_passwd, 34);

+        encr = spw->pw_passwd;

     }

-    hash[34] = '\0';

-

-    if (g_strncmp(hash, "$1$", 3) == 0)

-    {

-        /* gnu style crypt(); */

-        saltcnt = 3;

-

-        while ((hash[saltcnt] != '$') && (saltcnt < 11))

-        {

-            salt[saltcnt] = hash[saltcnt];

-            saltcnt++;

-        }

-

-        salt[saltcnt] = '$';

-        salt[saltcnt + 1] = '\0';

-    }

-    else

-    {

-        /* classic two char salt */

-        salt[0] = hash[0];

-        salt[1] = hash[1];

-        salt[2] = '\0';

-    }

-

-    encr = crypt(pass, salt);

-

-    if (g_strncmp(encr, hash, 34) != 0)

-    {

-        return 0;

-    }

-

-    return 1;

+    return (strcmp(encr, crypt(pass, encr)) == 0);

 }

 /******************************************************************************/

sesman/chansrv/chansrv_fuse.c

diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c

index 9b16c9a..27ce757 100644

--- a/sesman/chansrv/chansrv_fuse.c

+++ b/sesman/chansrv/chansrv_fuse.c

@@ -52,7 +52,12 @@

 **                                                                           **

 ******************************************************************************/

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+

 #include "arch.h"

+#include "chansrv_fuse.h"

 /* dummy calls when XRDP_FUSE is not defined */

 int xfuse_init()                {}

@@ -63,6 +68,12 @@

 int xfuse_file_contents_range(int stream_id, char *data, int data_bytes)     {}

 int xfuse_file_contents_size(int stream_id, int file_size)                   {}

 int xfuse_add_clip_dir_item(char *filename, int flags, int size, int lindex) {}

+int xfuse_create_share(tui32 device_id, char *dirname)                       {}

+void xfuse_devredir_cb_open_file(void *vp, tui32 DeviceId, tui32 FileId)     {}

+void xfuse_devredir_cb_write_file(void *vp, char *buf, size_t length)        {}

+void xfuse_devredir_cb_read_file(void *vp, char *buf, size_t length)         {}

+void xfuse_devredir_cb_enum_dir(void *vp, struct xrdp_inode *xinode)         {}

+void xfuse_devredir_cb_enum_dir_done(void *vp, tui32 IoStatus)               {}

 #else

xrdp/xrdp_mm.c

diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c

index 008f191..6c01c85 100644

--- a/xrdp/xrdp_mm.c

+++ b/xrdp/xrdp_mm.c

@@ -825,7 +825,7 @@

     if (!(self->chan_trans_up))

     {

         log_message(LOG_LEVEL_ERROR,"xrdp_mm_connect_chansrv: error in"

-		"trans_connect chan");

+                    "trans_connect chan");

     }

     if (self->chan_trans_up)

** Diff limit reached (max: 250 lines) **