summaryrefslogtreecommitdiff
path: root/debian/patches-applied/update-motd
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-applied/update-motd')
-rw-r--r--debian/patches-applied/update-motd33
1 files changed, 16 insertions, 17 deletions
diff --git a/debian/patches-applied/update-motd b/debian/patches-applied/update-motd
index 6c2af5bb..e649a2f4 100644
--- a/debian/patches-applied/update-motd
+++ b/debian/patches-applied/update-motd
@@ -6,11 +6,11 @@ Authors: Dustin Kirkland <kirkland@canonical.com>
Upstream status: not yet submitted
-Index: pam.debian/modules/pam_motd/pam_motd.c
+Index: pam/modules/pam_motd/pam_motd.c
===================================================================
---- pam.debian.orig/modules/pam_motd/pam_motd.c
-+++ pam.debian/modules/pam_motd/pam_motd.c
-@@ -48,14 +48,39 @@
+--- pam.orig/modules/pam_motd/pam_motd.c
++++ pam/modules/pam_motd/pam_motd.c
+@@ -48,13 +48,38 @@
static char default_motd[] = DEFAULT_MOTD;
@@ -39,7 +39,6 @@ Index: pam.debian/modules/pam_motd/pam_motd.c
+ close(fd);
+}
+
- PAM_EXTERN
int pam_sm_open_session(pam_handle_t *pamh, int flags,
int argc, const char **argv)
{
@@ -52,7 +51,7 @@ Index: pam.debian/modules/pam_motd/pam_motd.c
if (flags & PAM_SILENT) {
return retval;
-@@ -73,6 +98,9 @@
+@@ -72,6 +97,9 @@
"motd= specification missing argument - ignored");
}
}
@@ -62,7 +61,7 @@ Index: pam.debian/modules/pam_motd/pam_motd.c
else
pam_syslog(pamh, LOG_ERR, "unknown option: %s", *argv);
}
-@@ -80,34 +108,23 @@
+@@ -79,34 +107,23 @@
if (motd_path == NULL)
motd_path = default_motd;
@@ -110,11 +109,11 @@ Index: pam.debian/modules/pam_motd/pam_motd.c
+ return retval;
}
-
-Index: pam.debian/modules/pam_motd/pam_motd.8.xml
+ /* end of module definition */
+Index: pam/modules/pam_motd/pam_motd.8.xml
===================================================================
---- pam.debian.orig/modules/pam_motd/pam_motd.8.xml
-+++ pam.debian/modules/pam_motd/pam_motd.8.xml
+--- pam.orig/modules/pam_motd/pam_motd.8.xml
++++ pam/modules/pam_motd/pam_motd.8.xml
@@ -52,6 +52,17 @@
</para>
</listitem>
@@ -133,10 +132,10 @@ Index: pam.debian/modules/pam_motd/pam_motd.8.xml
</variablelist>
</refsect1>
-Index: pam.debian/modules/pam_motd/pam_motd.8
+Index: pam/modules/pam_motd/pam_motd.8
===================================================================
---- pam.debian.orig/modules/pam_motd/pam_motd.8
-+++ pam.debian/modules/pam_motd/pam_motd.8
+--- pam.orig/modules/pam_motd/pam_motd.8
++++ pam/modules/pam_motd/pam_motd.8
@@ -45,6 +45,13 @@
/path/filename
file is displayed as message of the day\&.
@@ -151,10 +150,10 @@ Index: pam.debian/modules/pam_motd/pam_motd.8
.SH "MODULE TYPES PROVIDED"
.PP
Only the
-Index: pam.debian/modules/pam_motd/README
+Index: pam/modules/pam_motd/README
===================================================================
---- pam.debian.orig/modules/pam_motd/README
-+++ pam.debian/modules/pam_motd/README
+--- pam.orig/modules/pam_motd/README
++++ pam/modules/pam_motd/README
@@ -14,6 +14,10 @@
The /path/filename file is displayed as message of the day.