if PermitPAMUserChange, don't put username from temporary PAM passwd

[gssapi-openssh.git] / openssh / uuencode.c

diff --git a/openssh/uuencode.c b/openssh/uuencode.c
index a13949585f8eb4ea1bf12496164927e29ef5a234..f3774f1f39608734f6d68a110cfc42190deba6bc 100644 (file)
--- a/openssh/uuencode.c
+++ b/openssh/uuencode.c
@@ -1,4 +1,5 @@
-/* $OpenBSD: uuencode.c,v 1.24 2006/08/03 03:34:42 deraadt Exp $ */
+/*     $OpenBSD: uuencode.c,v 1.12 2001/03/01 02:27:18 deraadt Exp $   */
+
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -24,17 +25,13 @@
  */
 
 #include "includes.h"
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <resolv.h>
-#include <stdio.h>
-
 #include "xmalloc.h"
 #include "uuencode.h"
 
+RCSID("$OpenBSD: uuencode.c,v 1.12 2001/03/01 02:27:18 deraadt Exp $");
+
 int
-uuencode(const u_char *src, u_int srclength,
+uuencode(u_char *src, u_int srclength,
     char *target, size_t targsize)
 {
        return __b64_ntop(src, srclength, target, targsize);
@@ -53,7 +50,7 @@ uudecode(const char *src, u_char *target, size_t targsize)
                ;
        for (; *p != '\0' && *p != ' ' && *p != '\t'; p++)
                ;
-       /* and remove trailing whitespace because __b64_pton needs this */
+       /* and remote trailing whitespace because __b64_pton needs this */
        *p = '\0';
        len = __b64_pton(encoded, target, targsize);
        xfree(encoded);
@@ -61,16 +58,11 @@ uudecode(const char *src, u_char *target, size_t targsize)
 }
 
 void
-dump_base64(FILE *fp, u_char *data, u_int len)
+dump_base64(FILE *fp, u_char *data, int len)
 {
-       char *buf;
+       u_char *buf = xmalloc(2*len);
        int i, n;
 
-       if (len > 65536) {
-               fprintf(fp, "dump_base64: len > 65536\n");
-               return;
-       }
-       buf = xmalloc(2*len);
        n = uuencode(data, len, buf, 2*len);
        for (i = 0; i < n; i++) {
                fprintf(fp, "%c", buf[i]);