rpms/ecryptfs-utils/F-11 ecryptfs-utils-75-werror.patch,1.1,1.2

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/ecryptfs-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30633

Modified Files:
	ecryptfs-utils-75-werror.patch 
Log Message:
adapt werror patch


ecryptfs-utils-75-werror.patch:

Index: ecryptfs-utils-75-werror.patch
===================================================================
RCS file: /cvs/extras/rpms/ecryptfs-utils/F-11/ecryptfs-utils-75-werror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ecryptfs-utils-75-werror.patch	5 May 2009 11:16:59 -0000	1.1
+++ ecryptfs-utils-75-werror.patch	5 May 2009 11:42:36 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up ecryptfs-utils-75/src/libecryptfs/key_management.c.werror ecryptfs-utils-75/src/libecryptfs/key_management.c
 --- ecryptfs-utils-75/src/libecryptfs/key_management.c.werror	2009-05-01 00:53:13.000000000 +0200
-+++ ecryptfs-utils-75/src/libecryptfs/key_management.c	2009-05-04 17:49:49.940220924 +0200
++++ ecryptfs-utils-75/src/libecryptfs/key_management.c	2009-05-05 13:38:57.597408166 +0200
 @@ -18,6 +18,7 @@
   * 02111-1307, USA.
   */
@@ -17,9 +17,71 @@ diff -up ecryptfs-utils-75/src/libecrypt
  #include "../include/ecryptfs.h"
  
  #ifndef ENOKEY
+diff -up ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c
+--- ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c.werror	2009-04-30 23:40:12.000000000 +0200
++++ ecryptfs-utils-75/src/pam_ecryptfs/pam_ecryptfs.c	2009-05-05 13:40:11.506220610 +0200
+@@ -42,31 +42,6 @@
+ 
+ #define PRIVATE_DIR "Private"
+ 
+-static void error(const char *msg)
+-{
+-	syslog(LOG_ERR, "errno = [%i]; strerror = [%m]\n", errno);
+-	switch (errno) {
+-	case ENOKEY:
+-		syslog(LOG_ERR, "%s: Requested key not available\n", msg);
+-		return;
+-
+-	case EKEYEXPIRED:
+-		syslog(LOG_ERR, "%s: Key has expired\n", msg);
+-		return;
+-
+-	case EKEYREVOKED:
+-		syslog(LOG_ERR, "%s: Key has been revoked\n", msg);
+-		return;
+-
+-	case EKEYREJECTED:
+-		syslog(LOG_ERR, "%s: Key was rejected by service\n", msg);
+-		return;
+-	default:
+-		syslog(LOG_ERR, "%s: Unknown key error\n", msg);
+-		return;
+-	}
+-}
+-
+ /* returns: 0 for pam automounting not set, 1 for set, <0 for error */
+ static int ecryptfs_pam_automount_set(const char *homedir)
+ {
+@@ -249,8 +224,6 @@ static int private_dir(pam_handle_t *pam
+ 	char *autoumount = "auto-umount";
+ 	struct stat s;
+ 	pid_t pid;
+-	struct utmp *u;
+-	int count = 0;
+ 
+ 	if ((pwd = fetch_pwd(pamh)) == NULL) {
+ 		/* fetch_pwd() logged a message */
+@@ -297,7 +270,7 @@ static int private_dir(pam_handle_t *pam
+ 			if (stat(recorded, &s) != 0 && stat("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", &s) == 0) {
+ 				/* User has not recorded their passphrase */
+ 				unlink("/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
+-				symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
++				rc = symlink("/usr/share/ecryptfs-utils/ecryptfs-record-passphrase", "/var/lib/update-notifier/user.d/ecryptfs-record-passphrase");
+ 				fd = open("/var/lib/update-notifier/dpkg-run-stamp", O_WRONLY|O_CREAT|O_NONBLOCK, 0666);
+ 				close(fd);
+ 			}
+@@ -390,7 +363,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_hand
+ 		}
+ 	} else {
+ 		syslog(LOG_ERR, "Error getting passwd info for user [%s]; "
+-		       "rc = [%ld]\n", username, rc);
++		       "rc = [%d]\n", username, rc);
+ 		goto out;
+ 	}
+ 	saved_uid = geteuid();
 diff -up ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c
---- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror	2009-05-04 17:50:33.587240171 +0200
-+++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c	2009-05-04 17:50:33.615345763 +0200
+--- ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c.werror	2009-05-01 01:04:38.000000000 +0200
++++ ecryptfs-utils-75/src/utils/ecryptfs_unwrap_passphrase.c	2009-05-05 13:38:57.603470839 +0200
 @@ -42,7 +42,6 @@ int main(int argc, char *argv[])
  	char *wrapping_passphrase;
  	char salt[ECRYPTFS_SALT_SIZE];