Merge branch 'master' of github.com:neutrinolabs/xrdp

40 files changed, 182 insertions, 68 deletions

diff --git a/sesman/access.c b/sesman/access.c
index 692575e5..1ba22df4 100644
--- a/sesman/access.c
+++ b/sesman/access.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/access.h b/sesman/access.h
index d53c65ad..2da6bb88 100644
--- a/sesman/access.h
+++ b/sesman/access.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am
index d200509a..89753430 100644
--- a/sesman/chansrv/Makefile.am
+++ b/sesman/chansrv/Makefile.am
@@ -1,4 +1,14 @@
-EXTRA_DIST = chansrv.h clipboard.h devredir.h sound.h
+EXTRA_DIST = \
+  chansrv.h \
+  chansrv_fuse.h \
+  clipboard.h \
+  clipboard_common.h \
+  clipboard_file.h \
+  devredir.h \
+  drdynvc.h \
+  rail.h \
+  sound.h \
+  xcommon.h
 
 EXTRA_DEFINES =
 EXTRA_INCLUDES =
diff --git a/sesman/chansrv/pulse/module-xrdp-sink.c b/sesman/chansrv/pulse/module-xrdp-sink.c
index f6650635..3f09b727 100644
--- a/sesman/chansrv/pulse/module-xrdp-sink.c
+++ b/sesman/chansrv/pulse/module-xrdp-sink.c
@@ -47,7 +47,6 @@
 #include <pulse/rtclock.h>
 #include <pulse/timeval.h>
 #include <pulse/xmalloc.h>
-//#include <pulse/i18n.h>
 
 #include <pulsecore/core-error.h>
 #include <pulsecore/sink.h>
@@ -168,7 +167,7 @@ static void sink_update_requested_latency_cb(pa_sink *s) {
     u->got_max_latency = 0;
     if (u->block_usec == (pa_usec_t) -1) {
         u->block_usec = s->thread_info.max_latency;
-        pa_log("2 block_usec %d", u->block_usec);
+        pa_log_debug("2 block_usec %d", u->block_usec);
         u->got_max_latency = 1;
     }
 
@@ -503,7 +502,7 @@ int pa__init(pa_module*m) {
     pa_sink_set_rtpoll(u->sink, u->rtpoll);
 
     u->block_usec = BLOCK_USEC;
-    pa_log("3 block_usec %d", u->block_usec);
+    pa_log_debug("3 block_usec %d", u->block_usec);
     nbytes = pa_usec_to_bytes(u->block_usec, &u->sink->sample_spec);
     pa_sink_set_max_rewind(u->sink, nbytes);
     pa_sink_set_max_request(u->sink, nbytes);
diff --git a/sesman/chansrv/pulse/pulse-notes.txt b/sesman/chansrv/pulse/pulse-notes.txt
index b5d51572..92a9878d 100644
--- a/sesman/chansrv/pulse/pulse-notes.txt
+++ b/sesman/chansrv/pulse/pulse-notes.txt
@@ -70,3 +70,10 @@ load-module module-xrdp-sink
 load-module module-native-protocol-unix
 #load-module module-udev-detect tsched=0
 ---------------------------------
+
+To see a list of sinks
+pacmd list-sinks
+
+To manually load a sink
+pactl load-module module-xrdp-sink.so sink_name=test
+
diff --git a/sesman/chansrv/pulse/pulse-notes.ubuntu.txt b/sesman/chansrv/pulse/pulse-notes.ubuntu.txt
new file mode 100644
index 00000000..c0e29c40
--- /dev/null
+++ b/sesman/chansrv/pulse/pulse-notes.ubuntu.txt
@@ -0,0 +1,20 @@
+
+this is /etc/apt/sources.list
+I added the deb-src line
+
+----------------------
+deb http://packages.linuxmint.com/ maya main upstream import
+deb http://archive.ubuntu.com/ubuntu/ precise main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ precise-updates main restricted universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ precise-updates main restricted universe multiverse
+deb http://security.ubuntu.com/ubuntu/ precise-security main restricted universe multiverse
+deb http://archive.canonical.com/ubuntu/ precise partner
+deb http://packages.medibuntu.org/ precise free non-free
+
+#deb http://archive.getdeb.net/ubuntu precise-getdeb apps
+#deb http://archive.getdeb.net/ubuntu precise-getdeb games
+deb http://drbl.sourceforge.net/drbl-core drbl stable
+----------------------
+
+apt-get install dpkg-dev
+apt-get build-dep pulseaudio
diff --git a/sesman/config.c b/sesman/config.c
index e2131c14..c7c3de24 100644
--- a/sesman/config.c
+++ b/sesman/config.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -289,7 +289,7 @@ config_read_security(int file, struct config_security *sc,
         if (0 == g_strcasecmp(buf, SESMAN_CFG_SEC_ALWAYSGROUPCHECK))
         {
             sc->ts_always_group_check = text2bool((char *)list_get_item(param_v, i));
-        }	
+        }
     }
 
     /* printing security config */
@@ -297,7 +297,7 @@ config_read_security(int file, struct config_security *sc,
     g_printf("\tAllowRootLogin:       %i\r\n", sc->allow_root);
     g_printf("\tMaxLoginRetry:        %i\r\n", sc->login_retry);
     g_printf("\tAlwaysGroupCheck:     %i\r\n", sc->ts_always_group_check);
-    
+
     if (sc->ts_users_enable)
     {
         g_printf("\tTSUsersGroup:         %i\r\n", sc->ts_users);
diff --git a/sesman/config.h b/sesman/config.h
index 263975b3..b011ca9b 100644
--- a/sesman/config.h
+++ b/sesman/config.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/env.c b/sesman/env.c
index 0f71836e..72a67642 100644
--- a/sesman/env.c
+++ b/sesman/env.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/env.h b/sesman/env.h
index c185ae30..e70bfe6a 100644
--- a/sesman/env.h
+++ b/sesman/env.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/lock.c b/sesman/lock.c
index dd78ebbe..6337a541 100644
--- a/sesman/lock.c
+++ b/sesman/lock.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/lock.h b/sesman/lock.h
index 0b7c905f..1fd968ef 100644
--- a/sesman/lock.h
+++ b/sesman/lock.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp.c b/sesman/scp.c
index db97fda5..076d57b2 100644
--- a/sesman/scp.c
+++ b/sesman/scp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp.h b/sesman/scp.h
index c4f3de3a..1cdfbc4f 100644
--- a/sesman/scp.h
+++ b/sesman/scp.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c
index 6ecb47b1..aeaa22ee 100644
--- a/sesman/scp_v0.c
+++ b/sesman/scp_v0.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v0.h b/sesman/scp_v0.h
index e5c2f576..8aa6f401 100644
--- a/sesman/scp_v0.h
+++ b/sesman/scp_v0.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1.c b/sesman/scp_v1.c
index d3f0ab7f..12115929 100644
--- a/sesman/scp_v1.c
+++ b/sesman/scp_v1.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1.h b/sesman/scp_v1.h
index 0d224129..a1d718a7 100644
--- a/sesman/scp_v1.h
+++ b/sesman/scp_v1.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1_mng.c b/sesman/scp_v1_mng.c
index 9d1da0f5..2624644a 100644
--- a/sesman/scp_v1_mng.c
+++ b/sesman/scp_v1_mng.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/scp_v1_mng.h b/sesman/scp_v1_mng.h
index 0317ba5f..74d4e392 100644
--- a/sesman/scp_v1_mng.h
+++ b/sesman/scp_v1_mng.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sesman.c b/sesman/sesman.c
index 50652b37..4a294a5e 100644
--- a/sesman/sesman.c
+++ b/sesman/sesman.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sesman.h b/sesman/sesman.h
index 2eb70df9..71688987 100644
--- a/sesman/sesman.h
+++ b/sesman/sesman.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/session.c b/sesman/session.c
index 3a200f50..888604da 100644
--- a/sesman/session.c
+++ b/sesman/session.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/session.h b/sesman/session.h
index b62b2aee..4329df12 100644
--- a/sesman/session.h
+++ b/sesman/session.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sessvc/sessvc.c b/sesman/sessvc/sessvc.c
index 2344229c..b3e42178 100644
--- a/sesman/sessvc/sessvc.c
+++ b/sesman/sessvc/sessvc.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sig.c b/sesman/sig.c
index b8f320f1..7bb881ce 100644
--- a/sesman/sig.c
+++ b/sesman/sig.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/sig.h b/sesman/sig.h
index ac648da0..17f8f917 100644
--- a/sesman/sig.h
+++ b/sesman/sig.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/startwm.sh b/sesman/startwm.sh
index 457ca1a5..ee48263f 100755
--- a/sesman/startwm.sh
+++ b/sesman/startwm.sh
@@ -1,25 +1,101 @@
 #!/bin/sh
-if [ -r /etc/default/locale ]; then
-  . /etc/default/locale
-  export LANG LANGUAGE
-fi
-
-# debian
-if [ -r /etc/X11/Xsession ]; then
-  . /etc/X11/Xsession
-  exit 0
-fi
-
-# el
-if [ -r /etc/X11/xinit/Xsession ]; then
-  . /etc/X11/xinit/Xsession
-  exit 0
-fi
-
-# suse
-if [ -r /etc/X11/xdm/Xsession ]; then
-  . /etc/X11/xdm/Xsession
-  exit 0
-fi
-
-xterm
+
+#start the window manager
+wm_start()
+{
+  if [ -r /etc/default/locale ]; then
+    . /etc/default/locale
+    export LANG LANGUAGE
+  fi
+
+  # debian
+  if [ -r /etc/X11/Xsession ]; then
+    . /etc/X11/Xsession
+    exit 0
+  fi
+
+  # el
+  if [ -r /etc/X11/xinit/Xsession ]; then
+    . /etc/X11/xinit/Xsession
+    exit 0
+  fi
+
+  # suse
+  if [ -r /etc/X11/xdm/Xsession ]; then
+    . /etc/X11/xdm/Xsession
+    exit 0
+  fi
+
+  xterm
+}
+
+#Execution sequence for interactive login shell
+#Following pseudo code explains the sequence of execution of these files.
+#execute /etc/profile
+#IF ~/.bash_profile exists THEN
+#    execute ~/.bash_profile
+#ELSE
+#    IF ~/.bash_login exist THEN
+#        execute ~/.bash_login
+#    ELSE
+#        IF ~/.profile exist THEN
+#            execute ~/.profile
+#        END IF
+#    END IF
+#END IF
+pre_start()
+{
+  if [ -f /etc/profile ]
+  then
+    . /etc/profile
+  fi
+  if [ -f ~/.bash_profile ]
+  then
+    . ~/.bash_profile
+  else
+    if [ -f ~/.bash_login ]
+    then
+      . ~/.bash_login
+    else
+      if [ -f ~/.profile ]
+      then
+        . ~/.profile
+      fi
+    fi
+  fi
+  return 0
+}
+
+#When you logout of the interactive shell, following is the
+#sequence of execution:
+#IF ~/.bash_logout exists THEN
+#    execute ~/.bash_logout
+#END IF
+post_start()
+{
+  if [ -f ~/.bash_logout ]
+  then
+    . ~/.bash_logout
+  fi
+  return 0
+}
+
+#. /etc/environment
+#export PATH=$PATH
+#export LANG=$LANG
+
+# change PATH to be what your environment needs usually what is in
+# /etc/environment
+#PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
+#export PATH=$PATH
+
+# for PATH and LANG from /etc/environment
+# pam will auto process the environment file if /etc/pam.d/xrdp-sesman
+# includes
+# auth       required     pam_env.so readenv=1
+
+pre_start
+wm_start
+post_start
+
+exit 1
diff --git a/sesman/thread.c b/sesman/thread.c
index a33b93d9..0ed1182a 100644
--- a/sesman/thread.c
+++ b/sesman/thread.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/thread.h b/sesman/thread.h
index 9dcb53b4..83a4b63d 100644
--- a/sesman/thread.h
+++ b/sesman/thread.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/Makefile.am b/sesman/tools/Makefile.am
index ab3612d0..140c6820 100644
--- a/sesman/tools/Makefile.am
+++ b/sesman/tools/Makefile.am
@@ -13,9 +13,11 @@ INCLUDES = \
 
 bin_PROGRAMS = \
   xrdp-sesrun \
-  xrdp-sestest \
   xrdp-sesadmin \
-  xrdp-dis \
+  xrdp-dis
+
+noinst_PROGRAMS = \
+  xrdp-sestest \
   xrdp-xcon
 
 xrdp_sesrun_SOURCES = \
diff --git a/sesman/tools/dis.c b/sesman/tools/dis.c
index 52400847..adcc3ee0 100644
--- a/sesman/tools/dis.c
+++ b/sesman/tools/dis.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/sesrun.c b/sesman/tools/sesrun.c
index 5ad3b5cc..7ac10102 100644
--- a/sesman/tools/sesrun.c
+++ b/sesman/tools/sesrun.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/tcp.c b/sesman/tools/tcp.c
index c8d01e96..2f7ae948 100644
--- a/sesman/tools/tcp.c
+++ b/sesman/tools/tcp.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/tcp.h b/sesman/tools/tcp.h
index 2fd7963e..6697c662 100644
--- a/sesman/tools/tcp.h
+++ b/sesman/tools/tcp.h
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/tools/xcon.c b/sesman/tools/xcon.c
index bb715054..80832276 100644
--- a/sesman/tools/xcon.c
+++ b/sesman/tools/xcon.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/verify_user.c b/sesman/verify_user.c
index 85e614d3..98d3dd32 100644
--- a/sesman/verify_user.c
+++ b/sesman/verify_user.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/verify_user_kerberos.c b/sesman/verify_user_kerberos.c
index fc0d4aa2..a6480f56 100644
--- a/sesman/verify_user_kerberos.c
+++ b/sesman/verify_user_kerberos.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/sesman/verify_user_pam.c b/sesman/verify_user_pam.c
index b7a7bef7..e53f72d5 100644
--- a/sesman/verify_user_pam.c
+++ b/sesman/verify_user_pam.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ get_service_name(char *service_name)
 }
 
 /******************************************************************************/
-/* returns long, zero is no go 
+/* returns long, zero is no go
  Stores the detailed error code in the errorcode variable*/
 
 long DEFAULT_CC
@@ -138,7 +138,7 @@ auth_userpass(char *user, char *pass, int *errorcode)
         g_free(auth_info);
         return 0;
     }
-    /* From man page:  
+    /* From man page:
        The pam_acct_mgmt function is used to determine if the users account is
        valid. It checks for authentication token and account expiration and
        verifies access restrictions. It is typically called after the user has
diff --git a/sesman/verify_user_pam_userpass.c b/sesman/verify_user_pam_userpass.c
index 4d6aac40..7f31176e 100644
--- a/sesman/verify_user_pam_userpass.c
+++ b/sesman/verify_user_pam_userpass.c
@@ -1,7 +1,7 @@
 /**
  * xrdp: A Remote Desktop Protocol server.
  *
- * Copyright (C) Jay Sorg 2004-2012
+ * Copyright (C) Jay Sorg 2004-2013
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.