Skip to content
Snippets Groups Projects
Commit f25c632d authored by Anna Wilcox's avatar Anna Wilcox :fox:
Browse files

Merge branch 'chntpw' into 'master' 

user/chntpw: new port

See merge request !432
parents 3d6323a0 8a986046
No related branches found
No related tags found
1 merge request!432user/chntpw: new port
Hide whitespace changes
Inline Side-by-side
Showing
with 246 additions and 0 deletions
user/chntpw/APKBUILD 0 → 100644
+ 40
− 0
View file @ f25c632d
# Contributor: CyberLeo <cyberleo@cyberleo.net>
# Maintainer: CyberLeo <cyberleo@cyberleo.net>
pkgname=chntpw
pkgver=140201
pkgrel=0
pkgdesc="Change passwords in Windows SAM files"
url="https://pogostick.net/~pnh/ntpasswd/"
arch="all"
options="!check" # No test suite.
license="(LGPL-2.1-only AND GPL-2.0-only)"
depends=""
makedepends=""
source="https://pogostick.net/~pnh/ntpasswd/$pkgname-source-$pkgver.zip
stdint.patch
chntpw-080526-correct-test-for-failing-open-syscall.patch
chntpw-110511-detect-failure-to-write-key.patch
chntpw-110511-reged-no-deref-null.patch
chntpw-110511-robustness.patch
chntpw-140201-get_abs_path.patch
getopt-signed-char-return.patch
"
build() {
make CC="${CC:-gcc}" CFLAGS="$CFLAGS" \
chntpw cpnt reged
}
package() {
install -d "$pkgdir"/usr/bin
install chntpw cpnt reged "$pkgdir"/usr/bin/
}
sha512sums="a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa chntpw-source-140201.zip
3ed747119d125b3e4dc8dbb2a697d411ef2f4403ec84c60177d8e35389bc695bb0c65f7aa4314ca320ffceec87e60e2a0c81d52544b90463fe23aa7d4a50df67 stdint.patch
1332407858eb20e0f1304472bc458789ef78638059137b91ff0b7bac9619740e8a608aace0330ace363853b5c02642fdbbc66bc47dac19f6807dae57cdaca4ca chntpw-080526-correct-test-for-failing-open-syscall.patch
a570451f52943a2ccdced349c5fe4e82e1a338dd6d0067ddaf18dc328b2c3ee3976d08827eee866b4654ccbda93ad95dcbabaddd0b6487a1e4112b66fc63bde1 chntpw-110511-detect-failure-to-write-key.patch
c61ea69ea1f039e470f501fddd1d3674ee7427e9084361a1aba03402d302a07efd1a2630e16f479bd3cef13b17e85c14cbfff53cb33bccb470465276b1b7ac22 chntpw-110511-reged-no-deref-null.patch
bcc314545272b5be04612e435a2f9dd13cbf065cfbd80aed2ed57147ee9e73b2478cd18e95cbaa7ad3b5dfcf4788a3026b5ddd767f89ea9c80ba7a2efc7ea8c4 chntpw-110511-robustness.patch
1bb5939d2cfd3718b9e630998b250c3c37d50d5769463f4f8456ede9fa4521e1bf9d9f05986883df36418d91bef591b34a81cd36bfacca053160e4d95c03cb4b chntpw-140201-get_abs_path.patch
85bbe9c7f21362cdff6becd94fe402d051a770105ec2eeb61e1936693e0a39ee03b6e971843c251f7768499444711392d966227f6126c328f7f58055cafe38d7 getopt-signed-char-return.patch"
user/chntpw/chntpw-080526-correct-test-for-failing-open-syscall.patch 0 → 100644
+ 75
− 0
View file @ f25c632d
From jim@meyering.net Mon Jul 20 20:05:55 2009
Return-Path: jim@meyering.net
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on amd.home.annexia.org
X-Spam-Level:
X-Spam-Status: No, score=-2.2 required=5.0 tests=AWL,BAYES_00,
UNPARSEABLE_RELAY autolearn=ham version=3.2.5
Received: from mail.corp.redhat.com [10.5.5.51]
by amd.home.annexia.org with IMAP (fetchmail-6.3.8)
for <rjones@localhost> (single-drop); Mon, 20 Jul 2009 20:05:55 +0100 (BST)
Received: from zmta03.collab.prod.int.phx2.redhat.com (LHLO
zmta03.collab.prod.int.phx2.redhat.com) (10.5.5.33) by
mail06.corp.redhat.com with LMTP; Mon, 20 Jul 2009 15:05:47 -0400 (EDT)
Received: from localhost (localhost.localdomain [127.0.0.1])
by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 2C1134E4EB
for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:47 -0400 (EDT)
Received: from zmta03.collab.prod.int.phx2.redhat.com ([127.0.0.1])
by localhost (zmta03.collab.prod.int.phx2.redhat.com [127.0.0.1]) (amavisd-new, port 10024)
with ESMTP id a7N9dvNRkYQB for <rjones@redhat.com>;
Mon, 20 Jul 2009 15:05:47 -0400 (EDT)
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
by zmta03.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 034384E4D6
for <rjones@mail.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400 (EDT)
Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199])
by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n6KJ5kIt032703
for <rjones@int-mx2.corp.redhat.com>; Mon, 20 Jul 2009 15:05:46 -0400
Received: from mx.meyering.net (sebastian-int.corp.redhat.com [172.16.52.221])
by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n6KJ5jf3021050
for <rjones@redhat.com>; Mon, 20 Jul 2009 15:05:45 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
id D674638154; Mon, 20 Jul 2009 21:05:44 +0200 (CEST)
From: Jim Meyering <jim@meyering.net>
To: "Richard W. M. Jones" <rjones@redhat.com>
Subject: chntpw [PATCH] correct test for failing "open" syscall
Date: Mon, 20 Jul 2009 21:05:44 +0200
Message-ID: <878wij899z.fsf@meyering.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26
Status: RO
Content-Length: 1103
Lines: 33
This one is weird.
It must be code that is never exercised,
since the existing code is totally bogus.
The condition, !open(...), will almost always be true.
(sole exception is when starting a program with stdin
initially closed)
>From bc4cddb06cf13c189fbdc93e6962cad072779097 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 20 Jul 2009 14:59:19 -0400
Subject: [PATCH] correct test for failing "open" syscall
* ntreg.c (writeHive): Test open() < 0, not !open().
---
ntreg.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ntreg.c b/ntreg.c
index be6b680..21cd3e3 100644
--- a/ntreg.c
+++ b/ntreg.c
@@ -2765,7 +2765,7 @@ int writeHive(struct hive *hdesc)
if ( !(hdesc->state & HMODE_DIRTY)) return(0);
if ( !(hdesc->state & HMODE_OPEN)) { /* File has been closed */
- if (!(hdesc->filedesc = open(hdesc->filename,O_RDWR))) {
+ if ((hdesc->filedesc = open(hdesc->filename,O_RDWR)) < 0) {
fprintf(stderr,"writeHive: open(%s) failed: %s, FILE NOT WRITTEN!\n",hdesc->filename,strerror(errno));
return(1);
}
--
1.6.2.5
user/chntpw/chntpw-110511-detect-failure-to-write-key.patch 0 → 100644
+ 19
− 0
View file @ f25c632d
diff -ur chntpw-110511.orig/ntreg.c chntpw-110511/ntreg.c
--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700
+++ chntpw-110511/ntreg.c 2011-11-01 13:45:02.550421729 -0700
@@ -3389,7 +3389,14 @@
fprintf(file,"\r\n"); /* Must end file with an empty line, windows does that */
- fclose(file);
+ if (ferror (file)) {
+ printf("failed to write file '%s'\n", filename);
+ fclose (file);
+ return;
+ }
+ if (fclose(file))
+ printf("failed to write file '%s': %s\n", filename,
+ strerror(errno));
}
/* ================================================================ */
user/chntpw/chntpw-110511-reged-no-deref-null.patch 0 → 100644
+ 15
− 0
View file @ f25c632d
diff -ur chntpw-110511.orig/reged.c chntpw-110511/reged.c
--- chntpw-110511.orig/reged.c 2011-05-11 12:33:56.000000000 -0700
+++ chntpw-110511/reged.c 2011-11-01 13:46:55.569625286 -0700
@@ -167,6 +167,11 @@
if (edit) { /* Call editor. Rest of arguments are considered hives to load */
hivename = argv[optind+no_hives];
+ if (!hivename) {
+ fprintf(stderr,"with -e you must specify at least one hive file name\n");
+ usage();
+ exit(1);
+ }
do {
if (!(hive[no_hives] = openHive(hivename,
HMODE_RW|mode))) {
user/chntpw/chntpw-110511-robustness.patch 0 → 100644
+ 39
− 0
View file @ f25c632d
--- chntpw-110511.orig/ntreg.c 2011-05-11 12:33:56.000000000 -0700
+++ chntpw-110511/ntreg.c 2011-12-18 17:09:06.290818997 -0800
@@ -190,14 +190,18 @@
int fmyinput(char *prmpt, char *ibuf, int maxlen)
{
-
+ int len;
printf("%s",prmpt);
fgets(ibuf,maxlen+1,stdin);
+ len = strlen(ibuf);
- ibuf[strlen(ibuf)-1] = 0;
+ if (len) {
+ ibuf[len-1] = 0;
+ --len;
+ }
- return(strlen(ibuf));
+ return len;
}
/* Print len number of hexbytes */
@@ -4119,6 +4123,14 @@
closeHive(hdesc);
return(NULL);
}
+
+ if (r < sizeof (*hdesc)) {
+ fprintf(stderr,
+ "file is too small; got %d bytes while expecting %d or more\n",
+ r, sizeof (*hdesc));
+ closeHive(hdesc);
+ return(NULL);
+ }
/* Now run through file, tallying all pages */
/* NOTE/KLUDGE: Assume first page starts at offset 0x1000 */
user/chntpw/chntpw-140201-get_abs_path.patch 0 → 100644
+ 10
− 0
View file @ f25c632d
--- chntpw-140201/ntreg.c.orig 2014-02-01 08:54:37.000000000 -0800
+++ chntpw-140201/ntreg.c 2018-07-02 16:10:39.625152640 -0700
@@ -1511,6 +1511,7 @@
}
strncpy(tmp,path,ABSPATHLEN-1);
+ tmp[ABSPATHLEN-1] = '\0';
if (key->type & 0x20)
keyname = mem_str(key->keyname, key->len_name);
user/chntpw/getopt-signed-char-return.patch 0 → 100644
+ 37
− 0
View file @ f25c632d
diff -ur chntpw-140201.orig/chntpw.c chntpw-140201/chntpw.c
--- chntpw-140201.orig/chntpw.c 2020-06-08 14:21:55.839494887 +0000
+++ chntpw-140201/chntpw.c 2020-06-08 14:22:29.922115922 +0000
@@ -1026,7 +1026,8 @@
int mode = HMODE_INFO;
extern int /* opterr, */ optind;
extern char* optarg;
- char *filename,c;
+ char *filename;
+ signed char c;
char *who = "Administrator";
char iwho[100];
FILE *ch; /* Write out names of touched files to this */
diff -ur chntpw-140201.orig/sampasswd.c chntpw-140201/sampasswd.c
--- chntpw-140201.orig/sampasswd.c 2020-06-08 14:21:49.661563576 +0000
+++ chntpw-140201/sampasswd.c 2020-06-08 14:22:21.009215027 +0000
@@ -140,7 +140,7 @@
int first = 0;
int ret, wret, il;
char *hivename;
- char c;
+ signed char c;
char *usr = NULL;
char *options = "rlHu:vNEthaf";
diff -ur chntpw-140201.orig/samusrgrp.c chntpw-140201/samusrgrp.c
--- chntpw-140201.orig/samusrgrp.c 2020-06-08 14:21:47.330589493 +0000
+++ chntpw-140201/samusrgrp.c 2020-06-08 14:22:19.218234941 +0000
@@ -176,7 +176,7 @@
int human = 0;
int ret, wret, il;
char *hivename;
- char c;
+ signed char c;
char *usr = NULL;
char *grp = NULL;
user/chntpw/stdint.patch 0 → 100644
+ 11
− 0
View file @ f25c632d
--- ./ntreg.h.orig
+++ ./ntreg.h
@@ -25,6 +25,8 @@
#ifndef _INCLUDE_NTREG_H
#define _INCLUDE_NTREG_H 1
+#include <stdint.h>
+
#define SZ_MAX 4096 /* Max unicode strlen before we truncate */
#define KEY_ROOT 0x2c /* Type ID of ROOT key node */
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment