*** ./source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c.ORIG	Tue May  1 23:08:50 2012
--- ./source3/lib/netapi/examples/netdomjoin-gui/netdomjoin-gui.c	Tue May  1 23:19:45 2012
***************
*** 31,36 ****
--- 31,40 ----
  
  #include <netapi.h>
  
+ #ifdef _AIX
+ #include "vasprintf.c"
+ #endif
+ 
  #define MAX_CRED_LEN 256
  #define MAX_NETBIOS_NAME_LEN 15
  
***************
*** 1765,1770 ****
--- 1769,1777 ----
  	}
  
  	{
+ #if defined(_AIX51) && !defined(_AIX52)
+ #define HOST_NAME_MAX 256
+ #endif
  		char my_hostname[HOST_NAME_MAX];
  		const char *p = NULL;
  		struct hostent *hp = NULL;
*** ./source3/lib/netapi/examples/netdomjoin-gui/vasprintf.c.ORIG	Tue May  1 23:17:55 2012
--- ./source3/lib/netapi/examples/netdomjoin-gui/vasprintf.c	Tue May  1 23:17:39 2012
***************
*** 0 ****
--- 1,188 ----
+ /* Like vsprintf but provides a pointer to malloc'd storage, which must
+    be freed by the caller.
+    Copyright (C) 1994, 1998-1999, 2000-2003, 2006-2007 Free Software Foundation, Inc.
+ 
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ 
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ /*
+ #include <config.h>
+ */
+ 
+ /* Specification.  */
+ #include <stdio.h>
+ 
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <math.h>
+ 
+ #ifdef TEST
+ size_t global_total_width;
+ #endif
+ 
+ #ifndef va_copy
+ # define va_copy(__list1,__list2) ((void)(__list1 = __list2))
+ #endif
+ 
+ static int
+ int_vasprintf (char **result, const char *format, va_list args)
+ {
+   const char *p = format;
+   /* Add one to make sure that it is never zero, which might cause malloc
+      to return NULL.  */
+   size_t total_width = strlen (format) + 1;
+   va_list ap;
+ 
+   va_copy (ap, args);
+   while (*p != '\0')
+     {
+       if (*p++ == '%')
+ 	{
+ 	  while (strchr ("-+ #0", *p))
+ 	    ++p;
+ 	  if (*p == '*')
+ 	    {
+ 	      ++p;
+ 	      total_width += abs (va_arg (ap, int));
+ 	    }
+ 	  else
+ 	    total_width += strtoul (p, (char **) &p, 10);
+ 	  if (*p == '.')
+ 	    {
+ 	      ++p;
+ 	      if (*p == '*')
+ 		{
+ 		  ++p;
+ 		  total_width += abs (va_arg (ap, int));
+ 		}
+ 	      else
+ 		total_width += strtoul (p, (char **) &p, 10);
+ 	    }
+ 	  while (strchr ("hlLjtz", *p))
+ 	    ++p;
+ 	  /* Should be big enough for any format specifier except %s
+ 	     and floats.  */
+ 	  total_width += 30;
+ 	  switch (*p)
+ 	    {
+ 	    case 'd':
+ 	    case 'i':
+ 	    case 'o':
+ 	    case 'u':
+ 	    case 'x':
+ 	    case 'X':
+ 	    case 'c':
+ 	      (void) va_arg (ap, int);
+ 	      break;
+ 	    case 'f':
+ 	    case 'F':
+ 	      {
+ 		double arg = va_arg (ap, double);
+ 		if (arg >= 1.0 || arg <= -1.0)
+ 		  /* Since an ieee double can have an exponent of 307, we'll
+ 		     make the buffer wide enough to cover the gross case. */
+ 		  total_width += 307;
+ 	      }
+ 	      break;
+ 	    case 'e':
+ 	    case 'E':
+ 	    case 'g':
+ 	    case 'G':
+ 	      (void) va_arg (ap, double);
+ 	      break;
+ 	    case 's':
+ 	      total_width += strlen (va_arg (ap, char *));
+ 	      break;
+ 	    case 'p':
+ 	    case 'n':
+ 	      (void) va_arg (ap, char *);
+ 	      break;
+ 	    }
+ 	  p++;
+ 	}
+     }
+   va_end (ap);
+ 
+ #ifdef TEST
+   global_total_width = total_width;
+ #endif
+   *result = malloc (total_width);
+   if (*result != NULL)
+     return vsprintf (*result, format, args);
+   else
+     return -1;
+ }
+ 
+ int
+ vasprintf (char **result, const char *format, va_list args)
+ {
+   return int_vasprintf (result, format, args);
+ }
+ 
+ int
+ asprintf (char **result, const char *format, ...)
+ {
+   va_list args;
+   int done;
+ 
+   va_start (args, format);
+   done = vasprintf (result, format, args);
+   va_end (args);
+ 
+   return done;
+ }
+ 
+ /* ========================= test program ========================= */
+ 
+ #ifdef TEST
+ 
+ #include <float.h>
+ 
+ void
+ checkit (const char* format, ...)
+ {
+   va_list args;
+   char *result;
+ 
+   va_start (args, format);
+   vasprintf (&result, format, args);
+   va_end (args);
+   if (strlen (result) < global_total_width)
+     printf ("PASS: ");
+   else
+     printf ("FAIL: ");
+   printf ("%lu %s\n", (unsigned long) global_total_width, result);
+ }
+ 
+ int
+ main ()
+ {
+   checkit ("%d", 0x12345678);
+   checkit ("%200d", 5);
+   checkit ("%.300d", 6);
+   checkit ("%100.150d", 7);
+   checkit ("%s", "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\
+ 777777777777777777333333333333366666666666622222222222777777777777733333");
+   checkit ("%f%s%d%s", 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx");
+   checkit ("%e", DBL_MIN);
+   checkit ("%e", DBL_MAX);
+   checkit ("%.400f", DBL_MIN);
+   checkit ("%f", DBL_MAX);
+   checkit ("%g", DBL_MIN);
+   checkit ("%g", DBL_MAX);
+   return 0;
+ }
+ 
+ #endif /* TEST */