Changeset 5379:2a383aaf4b1b in roaraudio for libroar

Timestamp:

12/26/11 09:57:46 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

• Cleanup,
• Set ISIT_BUILD in roard,
• Test for more alternatives for ssh-askpass,
• Display more infors in "allinfo" command in roarctl,
• Display server time using ctime_r() in roarctl.

Location:

libroar

Files:

• socket.c (modified) (2 diffs)
• sshaskpass.c (modified) (3 diffs)

libroar/socket.c

@@ -535 +535 @@
 #endif
 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6)
- struct hostent     * he;
+ struct hostent     * he = NULL;
 #endif
  //unsigned int host_div = 0;
@@ -646 +646 @@
 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6)
  memset(&socket_addr,    0, sizeof(socket_addr));
- memset(&he,             0, sizeof(he));               // FIXME: we have a valid pointer in here????
 #endif
 

libroar/sshaskpass.c

@@ -36 +36 @@
 #include "libroar.h"
 
+#ifdef _ASKPASS
+#undef _ASKPASS
+#endif
+
+#ifdef ROAR_HAVE_BIN_SSH_ASKPASS
+#define _ASKPASS ROAR_HAVE_BIN_SSH_ASKPASS
+#elif defined(ROAR_HAVE_BIN_GTK_LED_ASKPASS)
+#define _ASKPASS ROAR_HAVE_BIN_GTK_LED_ASKPASS
+#elif defined(ROAR_HAVE_BIN_X11_SSH_ASKPASS)
+#define _ASKPASS ROAR_HAVE_BIN_X11_SSH_ASKPASS
+#elif defined(ROAR_HAVE_BIN_GNOME_SSH_ASKPASS)
+#define _ASKPASS ROAR_HAVE_BIN_GNOME_SSH_ASKPASS
+#endif
+
 int roar_sshaskpass_getpass   (char ** pw, char * desc) {
-#if defined(ROAR_HAVE_BIN_SSH_ASKPASS) && defined(ROAR_SUPPORT_PASSWORD_API) && defined(ROAR_HAVE_POPEN) && defined(ROAR_HAVE_PCLOSE)
+#if defined(_ASKPASS) && defined(ROAR_SUPPORT_PASSWORD_API) && defined(ROAR_HAVE_POPEN) && defined(ROAR_HAVE_PCLOSE)
  FILE * cpipe;
  char   buf[1024];
@@ -46 +60 @@
   return -1;
 
- if ( (cpipe = popen(ROAR_HAVE_BIN_SSH_ASKPASS, "r")) == NULL ) {
+ if ( (cpipe = popen(_ASKPASS, "r")) == NULL ) {
   return -1;
  }
@@ -74 +88 @@
  return 0;
 #else
+ roar_err_set(ROAR_ERROR_NOSYS);
  return -1;
 #endif