Merge branch 'from-hg'

This commit is contained in:
Robert James Clay
2011-08-16 19:05:23 -04:00
682 changed files with 5860 additions and 7741 deletions

View File

@@ -1,6 +1,6 @@
# Makefile for MBSE BBS under Linux
# Copyright (c) 1998, 2004 by M. Broek.
# $Id$
# $Id: Makefile,v 1.8 2008/02/10 20:07:16 mbse Exp $
include ../Makefile.global

View File

@@ -1,6 +1,6 @@
/*****************************************************************************
*
* $Id$
* $Id: dlcount.c,v 1.7 2007/10/16 14:29:29 mbse Exp $
* Purpose ...............: Count WWW and FTP downloads
*
*****************************************************************************

View File

@@ -1,7 +1,7 @@
#ifndef _DLCOUNT_H
#define _DLCOUNT_H
/* $Id$ */
/* $Id: dlcount.h,v 1.1 2005/08/11 15:14:27 mbse Exp $ */
void dlcount(void);

View File

@@ -1,6 +1,6 @@
/*****************************************************************************
*
* $Id$
* $Id: mball.c,v 1.9 2007/09/02 11:17:33 mbse Exp $
* Purpose ...............: Creates allfiles listings
*
*****************************************************************************

View File

@@ -1,6 +1,6 @@
/*****************************************************************************
*
* $Id$
* $Id: mbbw.c,v 1.4 2007/08/25 18:32:09 mbse Exp $
* Purpose ...............: Dump Bluewave packets
*
*****************************************************************************

View File

@@ -1,6 +1,6 @@
/*****************************************************************************
*
* $Id$
* $Id: mblang.c,v 1.2 2005/08/30 17:45:31 mbse Exp $
* Purpose ...............: Language Compiler
*
*****************************************************************************

View File

@@ -1,10 +1,9 @@
/*****************************************************************************
*
* $Id$
* Purpose ...............: SNMP passthru support.
*
*****************************************************************************
* Copyright (C) 1997-2008
* Copyright (C) 1997-2011
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -90,7 +89,7 @@ int main(int argc, char **argv)
{
int i, getnext = FALSE, group = 0, sub = 0, params, val = 0;
char *t1, *t2, *saveptr1 = NULL, *saveptr2 = NULL, *token1, *token2;
char *base_save, *req_save, *envptr = NULL, *req_oid, *base_oid, *resp, *type;
char *base_save, *envptr = NULL, *req_oid, *base_oid, *resp, *type;
struct passwd *pw;
/*
@@ -136,7 +135,6 @@ int main(int argc, char **argv)
CFG.util_loglevel, CFG.error_log, CFG.mgrlog, CFG.debuglog);
base_save = xstrcpy(base_oid);
req_save = xstrcpy(req_oid);
for (i = 1, t1 = base_oid, t2 = req_oid; ; i++, t1 = NULL, t2 = NULL) {
token1 = strtok_r(t1, ".", &saveptr1);
token2 = strtok_r(t2, ".", &saveptr2);

View File

@@ -1,4 +1,4 @@
/* $Id$ */
/* $Id: mbsnmp.h,v 1.1 2008/02/10 20:07:16 mbse Exp $ */
#ifndef _MBSNMP_H
#define _MBSNMP_H

View File

@@ -1,6 +1,6 @@
/*****************************************************************************
*
* $Id$
* $Id: mbstat.c,v 1.5 2007/09/02 11:17:33 mbse Exp $
* Purpose ...............: Change BBS status
*
*****************************************************************************

View File

@@ -1,6 +1,6 @@
/*****************************************************************************
*
* $Id$
* $Id: mbtoberep.c,v 1.3 2005/10/11 20:49:49 mbse Exp $
* Purpose ...............: Show contents of toberep.data
*
*****************************************************************************

View File

@@ -1,10 +1,9 @@
/*****************************************************************************
*
* $Id$
* Purpose ...............: User Pack Util
*
*****************************************************************************
* Copyright (C) 1997-2007
* Copyright (C) 1997-2011
*
* Michiel Broek FIDO: 2:280/2802
* Beekmansbos 10
@@ -175,8 +174,8 @@ void UserPack(int days, int level, int pack)
{
FILE *fin, *fout;
char *fnin, *fnout, *cmd;
int oldsize, curpos;
int updated, delete = 0, rc, highest = 0, record = 0, sysop = FALSE;
int oldsize;
int updated, delete = 0, highest = 0, record = 0, sysop = FALSE;
time_t Last;
fnin = calloc(PATH_MAX, sizeof(char));
@@ -258,7 +257,6 @@ void UserPack(int days, int level, int pack)
*/
if (days && level) {
fseek(fout, sizeof(usrhdr), SEEK_SET);
curpos = sizeof(usrhdr);
while (fread(&usr, sizeof(usr), 1, fout) == 1) {
/*
@@ -318,22 +316,22 @@ void UserPack(int days, int level, int pack)
WriteError("Cannot delete unix account %s", usr.Name);
} else {
#ifndef __FreeBSD__
rc = execute_str((char *)"/usr/sbin/userdel ", usr.Name, NULL,
execute_str((char *)"/usr/sbin/userdel ", usr.Name, NULL,
(char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
#else
rc = execute_str((char *)"/usr/sbin/pw userdel ", usr.Name, NULL,
execute_str((char *)"/usr/sbin/pw userdel ", usr.Name, NULL,
(char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
#endif
#ifdef _VPOPMAIL_PATH
cmd = xstrcpy((char *)_VPOPMAIL_PATH);
cmd = xstrcat(cmd, (char *)"/vdeluser ");
rc = execute_str(cmd, usr.Name, NULL, (char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
execute_str(cmd, usr.Name, NULL, (char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
free(cmd);
#endif
if (chdir(CFG.bbs_usersdir) == 0) {
cmd = xstrcpy((char *)"-Rf ");
cmd = xstrcat(cmd, usr.Name);
rc = execute_pth((char *)"rm", cmd, (char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
execute_pth((char *)"rm", cmd, (char *)"/dev/null",(char *)"/dev/null",(char *)"/dev/null");
free(cmd);
}
}