rpms/authd/devel authd-1.4.3-jiffies64.patch, NONE, 1.1 authd.spec, 1.43, 1.44

[Roman Rakus (rrakus)]

Author: rrakus

Update of /cvs/extras/rpms/authd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31925

Modified Files:
	authd.spec 
Added Files:
	authd-1.4.3-jiffies64.patch 
Log Message:
Fixes trouble with int size on x86-64

authd-1.4.3-jiffies64.patch:

--- NEW FILE authd-1.4.3-jiffies64.patch ---
--- authd-1.4.3/authd.c.jiffies64	2007-03-27 16:45:50.000000000 -0400
+++ authd-1.4.3/authd.c	2007-03-27 17:47:33.000000000 -0400
@@ -347,6 +347,21 @@ static void create_opt(int argc, char *a
 
 static const char *const DELIM = ",: \t\r\n\v\f";
 
+static unsigned long long get_tok_ullong(char *s, unsigned base) {
+    unsigned long ull = ULLONG_MAX;
+
+    assert(base <= 36);
+    if ((s = strtok(s, DELIM)) != NULL) {
+        char *endptr;
+
+        ull = strtoull(s, &endptr, (int) base);
+        if (is_bad_strto(s, endptr))
+            errno = EINVAL;
+    }
+    else errno = EINVAL;
+    return ull;
+}
+
 static unsigned long get_tok_uint(char *s, unsigned base) {
     unsigned long ul = ULONG_MAX;
 
@@ -654,7 +669,7 @@ static bool get_info(reply_t *out, reque
         (void) get_tok_uint(NULL, 16);            // tx_queue
         (void) get_tok_uint(NULL, 16);            // rx_queue
         (void) get_tok_uint(NULL, 16);            // tr (boolean)
-        (void) get_tok_uint(NULL, 16);            // tm->when (unit: jiffies)
+        (void) get_tok_ullong(NULL, 16);            // tm->when (unit: jiffies)
         strtok(NULL, DELIM);                      // retrnsmt
         uid = get_tok_uint(NULL, 10);             // uid (base 10 uint)
         strtok(NULL, DELIM);                      // timeout


Index: authd.spec
===================================================================
RCS file: /cvs/extras/rpms/authd/devel/authd.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- authd.spec	13 Feb 2008 09:54:27 -0000	1.43
+++ authd.spec	27 Feb 2008 14:15:17 -0000	1.44
@@ -1,7 +1,7 @@
 Summary: A RFC 1413 ident protocol daemon
 Name: authd
 Version: 1.4.3
-Release: 13
+Release: 14
 License: GPLv2+
 Group: System Environment/Daemons
 Obsoletes: pidentd <= 3.2
@@ -13,6 +13,7 @@
 Patch2: authd-1.4.3-ipv6-mapping.patch
 Patch3: authd-1.4.3-locale.patch
 Patch4: authd-1.4.3-longopt-identifier.patch
+Patch5: authd-1.4.3-jiffies64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: openssl-devel gettext
 Requires: xinetd
@@ -30,6 +31,7 @@
 %patch2 -p1 -b .ipv6map
 %patch3 -p1 -b .locale
 %patch4 -p1
+%patch5 -p1
 sed -i -e "s|/etc|%{_sysconfdir}|" config.h
 
 %build
@@ -70,6 +72,9 @@
 %{_sbindir}/in.authd
 
 %changelog
+* Tue Feb 26 2008 Roman Rakus <rrakus at redhat.cz> - 1.4.3-14
+- fix 234262 bug
+
 * Wed Feb 13 2008 Jan Safranek <jsafrane at redhat.com> - 1.4.3-13
 - fix rpmlint errors