mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
r18698: this stuff isn't needed anymore
metze
(This used to be commit 31b83ff4bd)
This commit is contained in:
Stefan Metzmacher
Gerald (Jerry) Carter
parent
89100480e8
commit
a1243ca999
@ -220,7 +220,7 @@ TALLOC_OBJ = lib/talloc.o
|
||||
LIB_WITHOUT_PROTO_OBJ = @LIBREPLACE_OBJS@ @SOCKET_WRAPPER_OBJS@
|
||||
|
||||
LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
|
||||
lib/getsmbpass.o lib/interface.o lib/md4.o \
|
||||
lib/interface.o lib/md4.o \
|
||||
lib/interfaces.o lib/pidfile.o \
|
||||
lib/signal.o lib/system.o lib/sendfile.o lib/time.o \
|
||||
lib/ufc.o lib/genrand.o lib/username.o \
|
||||
|
||||
@ -2666,40 +2666,6 @@ if test x"$samba_cv_HAVE_BROKEN_GETGROUPS" = x"yes"; then
|
||||
AC_DEFINE(HAVE_BROKEN_GETGROUPS,1,[Whether getgroups is broken])
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK([whether getpass should be replaced],samba_cv_REPLACE_GETPASS,[
|
||||
SAVE_CPPFLAGS="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS ${SAMBA_CONFIGURE_CPPFLAGS}"
|
||||
AC_TRY_COMPILE([
|
||||
#define REPLACE_GETPASS 1
|
||||
#define NO_PROTO_H 1
|
||||
#define NO_CONFIG_H 1
|
||||
#define main dont_declare_main
|
||||
#include "${srcdir-.}/lib/getsmbpass.c"
|
||||
#undef main
|
||||
],[],samba_cv_REPLACE_GETPASS=yes,samba_cv_REPLACE_GETPASS=no)
|
||||
CPPFLAGS="$SAVE_CPPFLAGS"
|
||||
])
|
||||
if test x"$samba_cv_REPLACE_GETPASS" = x"yes"; then
|
||||
AC_DEFINE(REPLACE_GETPASS,1,[Whether getpass should be replaced])
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK([for broken inet_ntoa],samba_cv_REPLACE_INET_NTOA,[
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <netinet/in.h>
|
||||
#ifdef HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
main() { struct in_addr ip; ip.s_addr = 0x12345678;
|
||||
if (strcmp(inet_ntoa(ip),"18.52.86.120") &&
|
||||
strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); }
|
||||
exit(1);}],
|
||||
samba_cv_REPLACE_INET_NTOA=yes,samba_cv_REPLACE_INET_NTOA=no,samba_cv_REPLACE_INET_NTOA=cross)])
|
||||
if test x"$samba_cv_REPLACE_INET_NTOA" = x"yes"; then
|
||||
AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced])
|
||||
fi
|
||||
|
||||
AC_CACHE_CHECK([for secure mkstemp],samba_cv_HAVE_SECURE_MKSTEMP,[
|
||||
AC_TRY_RUN([#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
@ -1,183 +0,0 @@
|
||||
/* Copyright (C) 1992-1998 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public License as
|
||||
published by the Free Software Foundation; either version 2 of the
|
||||
License, or (at your option) any later version.
|
||||
|
||||
The GNU C Library 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
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with the GNU C Library; see the file COPYING.LIB. If
|
||||
not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
||||
Cambridge, MA 02139, USA. */
|
||||
|
||||
/* Modified to use with samba by Jeremy Allison, 8th July 1995. */
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#ifdef REPLACE_GETPASS
|
||||
|
||||
#ifdef SYSV_TERMIO
|
||||
|
||||
/* SYSTEM V TERMIO HANDLING */
|
||||
|
||||
static struct termio t;
|
||||
|
||||
#define ECHO_IS_ON(t) ((t).c_lflag & ECHO)
|
||||
#define TURN_ECHO_OFF(t) ((t).c_lflag &= ~ECHO)
|
||||
#define TURN_ECHO_ON(t) ((t).c_lflag |= ECHO)
|
||||
|
||||
#ifndef TCSAFLUSH
|
||||
#define TCSAFLUSH 1
|
||||
#endif
|
||||
|
||||
#ifndef TCSANOW
|
||||
#define TCSANOW 0
|
||||
#endif
|
||||
|
||||
static int tcgetattr(int fd, struct termio *t)
|
||||
{
|
||||
return ioctl(fd, TCGETA, t);
|
||||
}
|
||||
|
||||
static int tcsetattr(int fd, int flags, struct termio *t)
|
||||
{
|
||||
if(flags & TCSAFLUSH)
|
||||
ioctl(fd, TCFLSH, TCIOFLUSH);
|
||||
return ioctl(fd, TCSETS, t);
|
||||
}
|
||||
|
||||
#elif !defined(TCSAFLUSH)
|
||||
|
||||
/* BSD TERMIO HANDLING */
|
||||
|
||||
static struct sgttyb t;
|
||||
|
||||
#define ECHO_IS_ON(t) ((t).sg_flags & ECHO)
|
||||
#define TURN_ECHO_OFF(t) ((t).sg_flags &= ~ECHO)
|
||||
#define TURN_ECHO_ON(t) ((t).sg_flags |= ECHO)
|
||||
|
||||
#define TCSAFLUSH 1
|
||||
#define TCSANOW 0
|
||||
|
||||
static int tcgetattr(int fd, struct sgttyb *t)
|
||||
{
|
||||
return ioctl(fd, TIOCGETP, (char *)t);
|
||||
}
|
||||
|
||||
static int tcsetattr(int fd, int flags, struct sgttyb *t)
|
||||
{
|
||||
return ioctl(fd, TIOCSETP, (char *)t);
|
||||
}
|
||||
|
||||
#else /* POSIX TERMIO HANDLING */
|
||||
#define ECHO_IS_ON(t) ((t).c_lflag & ECHO)
|
||||
#define TURN_ECHO_OFF(t) ((t).c_lflag &= ~ECHO)
|
||||
#define TURN_ECHO_ON(t) ((t).c_lflag |= ECHO)
|
||||
|
||||
static struct termios t;
|
||||
#endif /* SYSV_TERMIO */
|
||||
|
||||
static SIG_ATOMIC_T gotintr;
|
||||
static int in_fd = -1;
|
||||
|
||||
/***************************************************************
|
||||
Signal function to tell us were ^C'ed.
|
||||
****************************************************************/
|
||||
|
||||
static void gotintr_sig(void)
|
||||
{
|
||||
gotintr = 1;
|
||||
if (in_fd != -1)
|
||||
close(in_fd); /* Safe way to force a return. */
|
||||
in_fd = -1;
|
||||
}
|
||||
|
||||
char *getsmbpass(const char *prompt)
|
||||
{
|
||||
FILE *in, *out;
|
||||
int echo_off;
|
||||
static char buf[256];
|
||||
static size_t bufsize = sizeof(buf);
|
||||
size_t nread;
|
||||
|
||||
/* Catch problematic signals */
|
||||
CatchSignal(SIGINT, SIGNAL_CAST gotintr_sig);
|
||||
|
||||
/* Try to write to and read from the terminal if we can.
|
||||
If we can't open the terminal, use stderr and stdin. */
|
||||
|
||||
in = fopen ("/dev/tty", "w+");
|
||||
if (in == NULL) {
|
||||
in = stdin;
|
||||
out = stderr;
|
||||
} else {
|
||||
out = in;
|
||||
}
|
||||
|
||||
setvbuf(in, NULL, _IONBF, 0);
|
||||
|
||||
/* Turn echoing off if it is on now. */
|
||||
|
||||
if (tcgetattr (fileno (in), &t) == 0) {
|
||||
if (ECHO_IS_ON(t)) {
|
||||
TURN_ECHO_OFF(t);
|
||||
echo_off = tcsetattr (fileno (in), TCSAFLUSH, &t) == 0;
|
||||
TURN_ECHO_ON(t);
|
||||
} else {
|
||||
echo_off = 0;
|
||||
}
|
||||
} else {
|
||||
echo_off = 0;
|
||||
}
|
||||
|
||||
/* Write the prompt. */
|
||||
fputs(prompt, out);
|
||||
fflush(out);
|
||||
|
||||
/* Read the password. */
|
||||
buf[0] = 0;
|
||||
if (!gotintr) {
|
||||
in_fd = fileno(in);
|
||||
fgets(buf, bufsize, in);
|
||||
}
|
||||
nread = strlen(buf);
|
||||
if (nread) {
|
||||
if (buf[nread - 1] == '\n')
|
||||
buf[nread - 1] = '\0';
|
||||
}
|
||||
|
||||
/* Restore echoing. */
|
||||
if (echo_off) {
|
||||
if (gotintr && in_fd == -1)
|
||||
in = fopen ("/dev/tty", "w+");
|
||||
if (in != NULL)
|
||||
tcsetattr (fileno (in), TCSANOW, &t);
|
||||
}
|
||||
|
||||
fprintf(out, "\n");
|
||||
fflush(out);
|
||||
|
||||
if (in && in != stdin) /* We opened the terminal; now close it. */
|
||||
fclose(in);
|
||||
|
||||
/* Catch problematic signals */
|
||||
CatchSignal(SIGINT, SIGNAL_CAST SIG_DFL);
|
||||
|
||||
if (gotintr) {
|
||||
printf("Interupted by signal.\n");
|
||||
fflush(stdout);
|
||||
exit(1);
|
||||
}
|
||||
return buf;
|
||||
}
|
||||
|
||||
#else
|
||||
void getsmbpasswd_dummy(void);
|
||||
void getsmbpasswd_dummy(void) {;}
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user